tree c2f876e790df9f3bf1faa6a1355bd5a516649c11
parent 754de20104fb3918d280df5cae671fbd21dc5b64
parent dd22d5658142e62159a894a489ac28fa24fc96f0
author Xin Li <delphij@google.com> 1633657184 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657184 +0000

[automerger skipped] Merge Android 12 am: 89d23e9569 -s ours am: dd22d56581 -s ours

am skip reason: Merged-In I3b3ef768bb004daf8222e4171b72b02bb76497ab with SHA-1 3d791e8869 is already in history

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

Change-Id: I5cb3804e2ebd0de03b06debef950d04a154f8255