tree be15db5af4c3976765f451e9cda09b4fa7f78348
parent 40918473012626d6a62e56a668072a6a00093488
parent 2165b8570dbd76d7296c7cd31125b29a1582cfeb
author Sasha Smundak <asmundak@google.com> 1547575841 -0800
committer android-build-merger <android-build-merger@google.com> 1547575841 -0800

Merge "Convert Android.mk file to Android.bp" am: 4c43f7c257
am: 2165b8570d

Change-Id: Ie50552bd02097ac8d162274e3c98a88750ec522b