tree 3147bad47d97435dcf59d716d8f483dc30d2c827
parent 2a083e0aff4d126c786864996c99cbbbd13071de
parent 280cb4f027648b4e3dc200de87efb009ca34bc1a
author Sasha Smundak <asmundak@google.com> 1570212344 -0700
committer android-build-merger <android-build-merger@google.com> 1570212344 -0700

Merge "Convert apps/**/Android.mk file to Android.bp"
am: 280cb4f027

Change-Id: Ifcaaf87d9068684af73fc53e23987ee96164a877