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