diff options
| author | 2024-05-21 04:18:52 +0000 | |
|---|---|---|
| committer | 2024-05-21 04:18:52 +0000 | |
| commit | 33abdc1d5c731c91b184123f33dc2353fde3ca89 (patch) | |
| tree | af9d0e9b2e78419adc9e771c02439c1455be94e1 /libs/androidfw/ZipFileRO.cpp | |
| parent | ca00e3e6f26d25c1d042b53e75e6b4adac0aa256 (diff) | |
| parent | 9d9d5cef9e0298bec695e3aba6bd16ceb77c54b9 (diff) | |
[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-v2-dev am: 5428b1a143 -s ours am: 32db39c3e1 -s ours am: 9d9d5cef9e -s ours
am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 b459bcaac5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27318644
Change-Id: I92aa662314cf73f66058ea7d0891aee62d9cb925
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