tree cd2be2cabe1c2d3ce23002ea9ddcadef23274d7b
parent e77a2e13badfeaf06e64121925ffc5219d234b49
parent 5f82bb1d2560fcfb36da95a3c2b2320be356f9e7
author Xavier Ducrohet <xav@google.com> 1375889652 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375889652 -0700

am 5f82bb1d: Merge "Gradle 1.7"

* commit '5f82bb1d2560fcfb36da95a3c2b2320be356f9e7':
  Gradle 1.7