tree 3cd6db1c8a13aeac0311f6ee69b5f281bdc0d73d
parent c5e3eb87eb6f6cd126bea080de64bccec5097f4e
parent c6693706512b76e7bf34190490a38ccf9c6b56b9
author felkachang <felkachang@google.com> 1547853140 -0800
committer android-build-merger <android-build-merger@google.com> 1547853140 -0800

Merge "convert Android.mk to Android.bp"
am: c669370651

Change-Id: I43c41685acd0ba515e31d341083ed62da69bb981