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