diff options
| author | 2023-07-31 19:07:35 +0000 | |
|---|---|---|
| committer | 2023-07-31 19:07:35 +0000 | |
| commit | 2ac7d5c78900e86d1d4cf7c114f438af7eacc5b9 (patch) | |
| tree | 03733b701234c89444d9a8fa17c366c51e8e35e5 /libs/androidfw/ZipFileRO.cpp | |
| parent | da3dd126c6518f687d1532415a805f7bd30a0d8a (diff) | |
| parent | bc5800df32269101bebec01b1520d6c36e36efe2 (diff) | |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-qpr-dev am: 4ee9dc1682 -s ours am: bc5800df32 -s ours
am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24212143
Change-Id: Ib6dd5513c876915bdf7610f9c47b9f902d73b2b6
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