summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 20:22:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 20:22:58 +0000
commita8fc48c13b2a592999571581282c46dea97f184f (patch)
tree65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/ConfigDescription.cpp
parent8d2550344c47ea0023db30bca5d9df70dfdc6e4f (diff)
parent5e35aad2a2a6cfe98f23472da002b8badaaf1ec0 (diff)
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am: 5e35aad2a2 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: Ibdf5af8e428e9431842504a459f25e2bb6ffcafb 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