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