tree 8a3100825abe77dc4670060978650ba2f1a53433
parent c84d747f03ca0f2e08193511d323e697427f4fcf
parent 64b8511941775786bb10afe0f2a06113a38eaf2f
author Yuntao Xu <yuntaoxu@google.com> 1619802998 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619802998 +0000

Merge "Convert Android.mk to Android.bp" am: 64b8511941

Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I8a4c4bd0590aba47449d7c6212d2b81c086f4337