tree 0b7cb9be2ed3d1f228b3c9d1f363a51dd84ae908
parent 769544af4d0085c21c949e43c8f959be5a192434
parent 539c57493a8ef1378d51873bdc2bd3dabdd125e5
author Colin Cross <ccross@android.com> 1468284255 +0000
committer android-build-merger <android-build-merger@google.com> 1468284255 +0000

Merge \"Convert bzip Android.mk to Android.bp\"
am: 539c57493a

Change-Id: Iedfc7c03682726126f9d534a41fb36bbd3c440b2