summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-07-26 11:26:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 11:26:11 +0000
commit0316f4fb7b6f24d3040e47b7a0f666286115ffde (patch)
tree273faafc227a0c5689bdd812211f0cd63ce38aa3 /libs/androidfw/AssetManager2.cpp
parent1d6c954e96674b85feb029af5c80d95a830121dd (diff)
parentd0f6b9acee66bd0a0ceb193fed65deab9c1d0d8a (diff)
Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9acee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23891752 Change-Id: I07d3946f9d24085fb4492b8d47417875660452ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions