tree 6e76afbc70563eb941d85ae2305ec886e7e80161
parent 38bbdb4de831082ba75f362a4238395f4ae1cd58
parent 1c2c11990ca27b9a470ac8f178dbeace7dadb51f
author Sasha Smundak <asmundak@google.com> 1550803336 -0800
committer android-build-merger <android-build-merger@google.com> 1550803336 -0800

Merge "Convert Android.mk file to Android.bp"
am: 1c2c11990c

Change-Id: Ic4a9e6d41dd9932bb99310e73d99e3bb158983c4