tree c2f876e790df9f3bf1faa6a1355bd5a516649c11
parent 7dcc358286f1ddf878cadaeaf95d8fc165d37b1b
parent b14730276435508f61e8a79fb09af3b032db335b
author Xin Li <delphij@google.com> 1629246246 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246246 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3d791e8869 -s ours am: 754de20104 -s ours am: 6b20bedfe1 -s ours am: b147302764 -s ours

am skip reason: Merged-In Ia1a2c370112f75b2a6c1d5836016180ca896c261 with SHA-1 81a5ea0bd1 is already in history

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

Change-Id: I25d23ac133b8b7dddad6b33d6886055d89d2d455