tree 8a4729d6430c0982e7124026aaab3288894afe84
parent c781577e5c825a083c315b2d32483636e22c49cf
parent 2e8e69bd2a36cafe9775acfe9a65ef1fc305165b
author Colin Cross <ccross@android.com> 1513122107 +0000
committer android-build-merger <android-build-merger@google.com> 1513122107 +0000

Merge "Convert external/smali to Android.bp" am: 70168a3f8e am: ac6918ec87
am: 2e8e69bd2a

Change-Id: I0c090bdaa25728a69b50da40ec0c7a0444919411