tree 7bd1ad610593466b5f16e1dca816b8b3da6cc226
parent c52930e6a0bbd05a51fdfb458c968b3c3c4909b6
parent 14b78ea954cc925c5a113d6533bc5914da520994
author Yuntao Xu <yuntaoxu@google.com> 1619803843 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619803843 +0000

Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954

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

Change-Id: I025dc6a47dc1e11e6f01f392c65b6a60b8a0734c