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