summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-07-26 11:22:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 11:22:06 +0000
commit27ca2217b5b4052093e31a8a68dc6d48acc7726d (patch)
tree78d9ff7edd0bc754bed64be02ef5add67db09e98 /libs/androidfw/AssetManager2.cpp
parenta0638f14c9151aef9a79be32532f5e061f8e46fa (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: Ia0c88db2d581f34de67cd406a8a7ad49b4c48fa6 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