summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-08-02 11:18:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 11:18:27 +0000
commit5e764ff33dcf55a971c026fc176521c4055efa3f (patch)
tree909683d219412a132783f1b45c9671ab0dbe5687 /libs/androidfw/ConfigDescription.cpp
parent16f950f41ff8485e22908d31082d03bc2110e08a (diff)
parent306f04b9c619a5b2387bdde724c87cb660fb4028 (diff)
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c00694 am: f049b2096f -s ours am: 306f04b9c6 -s ours
am skip reason: Merged-In Ibe4fb69a90904787b9f97a7cd90d318a047d1e11 with SHA-1 2be24a7804 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982204 Change-Id: I367426eb7164c57d0e0a4e4e89a6f3fbb893a2f6 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