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

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

Change-Id: I717635d51c3e86541be0045a72619f1d69bfe5be