tree 3cb814041dfeee3fe814d9c9f0a6b4f835587b6c
parent f0ea23ec096b149bfad4665ab43e6c7ab10c841e
parent a1b87e9f3af5b377f7313754bae7e7df14a46ee9
author Sasha Smundak <asmundak@google.com> 1547183073 -0800
committer android-build-merger <android-build-merger@google.com> 1547183073 -0800

Merge "Convert Android.mk files to Android.bp."
am: a1b87e9f3a

Change-Id: I82273b0c8fdb0605265a54a68ff64eb6d952866a