summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-08-01 16:34:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-01 16:34:38 +0000
commit16f950f41ff8485e22908d31082d03bc2110e08a (patch)
tree909683d219412a132783f1b45c9671ab0dbe5687 /libs/androidfw/ConfigDescription.cpp
parentc1b0b217a9ec36e7219dcbed47c1493ae3aca83e (diff)
parentfee30bd247320e25a6efeed0517d2c1c7d58569f (diff)
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd247 -s ours
am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23981526 Change-Id: Id70715063e8b55562b27b9882492b829265282e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions