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