tree 82001b26de84ee6080ce71774f8c1fca6c60ded9
parent 19512652909f18827063e913608b59e41ca32e4e
parent e84565a7e229e93771705508287a52cb655a4a43
author Kiran S <krns@google.com> 1716268215 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1716268215 +0000

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c680 am: 6d77b32c25 -s ours am: 3c9228d263 -s ours am: e84565a7e2 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 71042ac086 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27318647

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