tree 40bcd00f0ac371a0c24887cc4ca963303d821b07
parent 5e8ce3bae9c800eb50d2d3a12598e4d12a9b705a
parent 84d0f704ebc744288a752145caf9193ee2ac7af9
author Dan Willemsen <dwillemsen@google.com> 1510981366 +0000
committer android-build-merger <android-build-merger@google.com> 1510981366 +0000

Merge "Switch aidl and zipalign prebuilts to build-tools" am: d6f229842a
am: 84d0f704eb

Change-Id: I26adc0efa82dbd0fdecdb16f6f664b2946af7f3e