am 5f82bb1d: Merge "Gradle 1.7"

* commit '5f82bb1d2560fcfb36da95a3c2b2320be356f9e7':
  Gradle 1.7