tree d51fe2c9b495971f9cde4ab36814184d070aa0b7
parent c0d9c717918bb3a060f867c2ec9a38b2b5f307df
parent 3c3a5d95b69da4d888a335027a2852e0d67fa91b
author Yuntao Xu <yuntaoxu@google.com> 1619803791 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619803791 +0000

Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211

Change-Id: Ic8c3a89b04ad07e763be1a98f534cb3efcdd815a