Merge changes I6f71d0b9,Ia1093c6e
authorXavier Ducrohet <xav@android.com>
Wed, 27 Mar 2013 22:20:57 +0000 (22:20 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Mar 2013 22:20:58 +0000 (22:20 +0000)
commit1196b30f9d2067c55d5c21d323444e61b207efaa
tree43556ba44eaaaa4a0703cd4e3f88bda1b2659334
parentbec5a0625fe759d19047f24f990173813db4e23f
parent8a5e09fc06ac75e9d5c761b2814099ed7d9c640b
Merge changes I6f71d0b9,Ia1093c6e

* changes:
  Make the Gradle plugin compatible with 1.5
  Use Gradle 1.5