tree 66b1e4771c72c67e633ca0910e9f6ffcf24be262
parent 3955efcc510e8869040fb2965c8b899a2241497a
parent d6809cd4d2905aa046bf0d4bef1df02f35316d03
author Sasha Smundak <asmundak@google.com> 1547063180 -0800
committer android-build-merger <android-build-merger@google.com> 1547063180 -0800

Merge "Convert Android.mk file to Android.bp" am: a2b4a33c84
am: d6809cd4d2

Change-Id: Ia4a2ee27d73b013aed813ead860afe8309525dee