summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-07-26 13:35:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 13:35:05 +0000
commit9c5fbf1a5982f6c738681d93115de130ad7e9105 (patch)
tree5c26899926a5e0ffef3b3e6598e43e9e20b113ef /libs/androidfw/AssetManager2.cpp
parentd0d2142c30edbe26c0f9afd193f406ee75031c8d (diff)
parentb5798c10353f6d20f8605b21516a046767ea0d66 (diff)
Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9acee am: 27ca2217b5 am: fc613ec09d am: b5798c1035
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23891752 Change-Id: Ic97076199f192000dbc065463aac4b54cec746ba 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