tree 03191f1adb9124d71f7110f655ee3bad48551de6
parent fd8fb19d5a5ba3110855436db92340e9e7c43715
parent 224087844b492e22312f92398a04ae0ed130f217
author Christopher Ferris <cferris@google.com> 1499986354 +0000
committer android-build-merger <android-build-merger@google.com> 1499986354 +0000

Merge "Move tools to separate directory." am: d312abe7c0 am: 3588f6a5fb
am: 224087844b

Change-Id: I279271308104e021865847e8857c49291a1c4dc3