tree d139254e25ee1b534790e3976ae2727983bf9bba
parent 2003f5faee37480f22f3a6c1f5ea49fd57ab5f39
parent 2f9c9126c553f73199db7853b64d6c99b5fc78a0
author Sasha Smundak <asmundak@google.com> 1547517699 -0800
committer android-build-merger <android-build-merger@google.com> 1547517699 -0800

Merge "Convert Android.mk file to Android.bp" am: bac50c02f3
am: 2f9c9126c5

Change-Id: If40cd0cc98c8742683c10a4a4c28f7f01669dd75