tree fad50f95c4f980ecbd89cb40ebc961b05117d1cb
parent b5abc3b6c83937143e2ad0dce6a2d5cc90908232
parent b0b6ab038c87526248d0f9cd41020581b50c8ea6
author Sasha Smundak <asmundak@google.com> 1547578217 -0800
committer android-build-merger <android-build-merger@google.com> 1547578217 -0800

Merge "Convert Android.mk to Android.bp."
am: b0b6ab038c

Change-Id: I1138e1742cf7c95edce9f5bb4bdb2ce3ba977d07