tree b35844196027573fe7793ec48cde4b350534b802
parent 86189eaef9c589d170b258f29fbd3cbb2e03b65f
parent f852f1e355cbbd42f00f8351678e220379fe643b
author Sasha Smundak <asmundak@google.com> 1547579452 -0800
committer android-build-merger <android-build-merger@google.com> 1547579452 -0800

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

Change-Id: I240bfe414d9c5f2168df676ab2b6c1bcc4a88279