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

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