tree d51fe2c9b495971f9cde4ab36814184d070aa0b7
parent b7529718e5650816bf1b9dd063f6b1f21be1bf5c
parent a927501359e84981c733122f582aec6511169275
author Yuntao Xu <yuntaoxu@google.com> 1619805757 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619805757 +0000

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

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

Change-Id: I233f2c5cea9ef78f64d963c4a9d10234723a6676