tree 77094bea81193611bdb1e4a38cbe27beffb08e02
parent df4cc242ae7c37924ada76a6fa77f910e3c41b39
parent 4c70b2982a612cc8e6618738b9f5ce0d38242a14
author Xin Li <delphij@google.com> 1696638029 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696638029 +0000

[automerger skipped] Merge Android 14 am: cfd3a6676c -s ours am: d7cb78e328 -s ours am: f6c47638ba -s ours am: d1d4d1f416 -s ours am: 4c70b2982a -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: I0323aca08b9a4ef9ddd796556d01461dc44e79f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>