diff options
| author | 2024-05-22 18:51:52 +0000 | |
|---|---|---|
| committer | 2024-05-22 18:51:52 +0000 | |
| commit | 3adfea3bb0a8aac51b88b76c80c39433a6156d22 (patch) | |
| tree | 6ca5836c74f922f893e22a7a45634f195c0f2acc /libs/androidfw/ZipFileRO.cpp | |
| parent | a713e174969b6072c139dd1e564cbad4ea037bc7 (diff) | |
| parent | 103127f852c40443f19d705ea28bd4c1194695ec (diff) | |
[automerger skipped] Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c680 am: 299e8d1773 -s ours am: 1d4f8cb0ed -s ours am: 1a11f03a99 -s ours am: 4c67bb3856 -s ours am: 103127f852 -s ours
am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b72b3bae18 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27318647
Change-Id: I456793fa5aed4d70fc7369e0319ded74313509f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions