tree 405c081341d82aed3be5ca076b339d3a34189c23
parent 0aa1e534f3dd021f1e47c5afa9b554fe65a80a5a
parent 7f96fc5aeebf25caf90a6e0f603f051bee8bb09f
author Justin Klaassen <justinklaassen@google.com> 1487025636 +0000
committer android-build-merger <android-build-merger@google.com> 1487025636 +0000

Use build-tools 25.0.0
am: 7f96fc5aee

Change-Id: I00f5341b61712dd98935d1e40791a8d30194b64c