am 87d1b7da: (-s ours) am a12f4e9f: Merge "Add gradle-2.5-all.zip"

* commit '87d1b7dabcb93972257f4c68af7c190d9804f27a':