diff options
| author | 2023-08-01 15:31:29 +0000 | |
|---|---|---|
| committer | 2023-08-01 15:31:29 +0000 | |
| commit | 227a8f8fbe54885daac8a513c0eb07271858a6cb (patch) | |
| tree | 78a2f290ae316c9381522afb49bf9861c1a8e218 /libs/androidfw/ZipFileRO.cpp | |
| parent | 2464182f2192d0c9a299c401b05ec6fc4b1afb8d (diff) | |
| parent | 7b492dd0a19e5a043efb62c796b2325ec32b8982 (diff) | |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: 0b3edb1946 -s ours am: a6b7bb6a0c -s ours am: 7b492dd0a1 -s ours
am skip reason: Merged-In I60896a6f53307f0e97a9223b599a2891c6c0c08d with SHA-1 570aad7c61 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982566
Change-Id: I225a22c3c71551a89855b8377ec523ddc06ca7e5
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