tree 77094bea81193611bdb1e4a38cbe27beffb08e02
parent 31557212c14a477f32875b6a44beaac2b0580d9b
parent f6c47638baf540c61ebf23aa8f2cffdb6dc180ef
author Xin Li <delphij@google.com> 1696585868 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696585868 +0000

[automerger skipped] Merge Android 14 am: cfd3a6676c -s ours am: d7cb78e328 -s ours am: f6c47638ba -s ours

am skip reason: Merged-In I1661a43476fc852d7adbeb26db7703f743c7f08f with SHA-1 b123928699 is already in history

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

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