tree b35844196027573fe7793ec48cde4b350534b802
parent 4cbf238a0393aeb57ce6cce5ebff94f5b407ae55
parent fe4c9d4785a59ceef411d4faf12f7b87ded0c448
author Sasha Smundak <asmundak@google.com> 1547580562 -0800
committer android-build-merger <android-build-merger@google.com> 1547580562 -0800

Merge "Convert Android.mk file to Android.bp" am: f852f1e355 am: 35d7bfafa2
am: fe4c9d4785

Change-Id: Iad698f93e489c8685840cae5267be6be2bd26f16