tree 3d114c2dcd012a7aa8fb1def2e8c88f918840aa1
parent 5d827f2e69dacf1cfddc03e66466f9af9a908b9f
parent e6e7b2dcf9093f7b6dce9522731fe5ddee8d68d2
author Xin Li <delphij@google.com> 1656547367 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547367 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 29b73998ed -s ours am: f501461f08 -s ours am: e6e7b2dcf9 -s ours

am skip reason: Merged-In Ia6d2d8e4d7f4e3c98d55767ab7c094fcbeb62d76 with SHA-1 5d827f2e69 is already in history

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

Change-Id: Ia8dabd8c185b1c608b2f4b14080490b04bc3f7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>