tree 0b7cb9be2ed3d1f228b3c9d1f363a51dd84ae908
parent 769544af4d0085c21c949e43c8f959be5a192434
parent 2cb42e2caf08d109428a5a9c642eb7868734f5ad
author Colin Cross <ccross@android.com> 1468289301 +0000
committer android-build-merger <android-build-merger@google.com> 1468289301 +0000

Merge \\\\"Convert bzip Android.mk to Android.bp\\\\" am: 539c57493a am: b0e77c4d65 am: 995696018e
am: 2cb42e2caf

Change-Id: I66d9788db0ce427e84d651a23459dfd2d223d2e6