tree 49e2d1f1f8d85c3b646f44d92c107f117474d46b
parent 2619c775d8e6ae2d16a4a5c116a086b1af9ff1e4
parent 0ddbc507f17ce4da4439915a302122356fb815e2
author Colin Cross <ccross@android.com> 1499385634 +0000
committer android-build-merger <android-build-merger@google.com> 1499385634 +0000

Merge "Use make variables to access java tools" am: d82b8eb5ce am: 59ddf611a1 am: 38fabb418c
am: 0ddbc507f1

Change-Id: I430ec489cacf1bd96e6ec8368278e51899bd7a4b