am e6cc455e: am 89cf5617: Merge "gradle 1.12"

* commit 'e6cc455e7a23d0b211a3b2032dbe0663d298d76b':
  gradle 1.12