diff options
| author | 2024-05-21 05:32:16 +0000 | |
|---|---|---|
| committer | 2024-05-21 05:32:16 +0000 | |
| commit | c2e5b8b3fa2755d70bf50f38f04e9713fde90581 (patch) | |
| tree | ae398cb8244c61c223d58e235f1c1bb933d41377 /libs/androidfw/ZipFileRO.cpp | |
| parent | def128704d7dad5405a3c813b6b8683f5492850f (diff) | |
| parent | afa485f63a05c54ce9ef2cc39c8be548be4433e7 (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: 2565a07b65 -s ours am: afa485f63a -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: Idce52da7fa732680bc7e438d1e28ff1b4dc23654
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