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