diff options
| author | 2024-05-21 04:45:21 +0000 | |
|---|---|---|
| committer | 2024-05-21 04:45:21 +0000 | |
| commit | 5faf1ea80e660a858dae757c5aa4fa6641b16e92 (patch) | |
| tree | dcba17b56d4b4750172bd238178958862e3dc35c /libs/androidfw/ZipFileRO.cpp | |
| parent | 40a48e228ce54009ac312980306eaa0c8e93cba1 (diff) | |
| parent | 33abdc1d5c731c91b184123f33dc2353fde3ca89 (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: 33abdc1d5c -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: Ie8b4f71dd616cb1783cd6d3ea757d4c7f2f63828
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