tree 8c008a02a8b5a022153ee8e3d1fb6daf6999e472
parent f9d0bb69baae6a0c386e94d8c93372de3d3278c6
parent 8ca20f3a0a7baad953c6605fd00f6705f8b2f186
author Sasha Smundak <asmundak@google.com> 1555088056 -0700
committer android-build-merger <android-build-merger@google.com> 1555088056 -0700

Merge "Convert Android.mk file to Android.bp" am: 67b20324c8
am: 8ca20f3a0a

Change-Id: I2cabff00c43ae58408c4663bec85426e10dad4ad