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