tree c2f876e790df9f3bf1faa6a1355bd5a516649c11
parent 6f5e5051183bb75cc2378a61b4796247823d19cc
parent 1cb43b4ff74a7896d212a32f464bcadde3cf40c2
author Yuntao Xu <yuntaoxu@google.com> 1624918871 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624918871 +0000

[automerger skipped] Merge "Convert tests/Android.mk to Android.bp" am: e365ae93b1 am: 1cb43b4ff7 -s ours

am skip reason: Merged-In Iec5408453710332c51929a02151112c52939a9a1 with SHA-1 949ec6dabb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Mtp/+/1690693

Change-Id: Ia1a2c370112f75b2a6c1d5836016180ca896c261