diff options
| author | 2023-08-01 17:16:45 +0000 | |
|---|---|---|
| committer | 2023-08-01 17:16:45 +0000 | |
| commit | 31c96f00e12ee4c27136443eb341294f699223aa (patch) | |
| tree | 22aed0806eaf70642e8ab5765fd02db0cd98c748 /libs/androidfw/ObbFile.cpp | |
| parent | 6618831d0d9d49c794ea6eafe446071e8a950bfe (diff) | |
| parent | 16f950f41ff8485e22908d31082d03bc2110e08a (diff) | |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd247 -s ours am: 16f950f41f -s ours
am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23981526
Change-Id: I5f7d30bb4a13bd3a9ac8e2723e15f3fdac3d5bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions