tree 29b28f6dc78e2788e0e201341733fef2bb5d92e2
parent f2a4d54272f6c07b3d8225aba8d3fa3978e02c7b
parent a03f6220bfadb68fa5688d17e2f07a7fc0b63b5e
author Colin Cross <ccross@android.com> 1508813374 +0000
committer android-build-merger <android-build-merger@google.com> 1508813374 +0000

Merge "Convert external/dexmaker to Android.bp" am: a3bc7e013a
am: a03f6220bf

Change-Id: I908d49b8e28bb423619afb89b70cb0ba9dcc9d7e