tree 9e79d01dfd9b8478b0a29da44266ba9404b22a52
parent 5b8d5fd0e4707ad85f0d625ecebf088dc31e59ee
parent 5497bc1aaaa3c25d38c1acf4ac4afd7c07fbfde5
author Tobias Thierer <tobiast@google.com> 1495447435 +0000
committer android-build-merger <android-build-merger@google.com> 1495447435 +0000

Merge "Make: Don't rely on presence of tools.jar in toolchain." am: 00e3bd93da am: bf0f0e26d7 am: ca910f5a42
am: 5497bc1aaa

Change-Id: I597a230c96192ddec323b5914e1e53929e758bb2