summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 22:19:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 22:19:34 +0000
commitee5ce751e302a91ca9396fe0accd211a34422092 (patch)
tree74a42c83567bf91f47c8ab123b7c177047de36bc /libs/androidfw/ConfigDescription.cpp
parent92475fa2154282edcea4ab1da929b2052dcf30da (diff)
parent7344e5a8815531ea70feb7126d252d37337a2002 (diff)
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: 219d6da566 -s ours am: 7b2ead4023 -s ours am: 2acb7db524 -s ours am: 7344e5a881 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ic98d640b553ebaec4b4ee35c852ee7d43ff5993b 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