summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 18:47:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 18:47:26 +0000
commit219d6da5668ea1f593ef5598772e47b3a6ab4c7d (patch)
tree74e7ef040b9f4f8dcc356542909059e7fb504d3f /libs/androidfw/ConfigDescription.cpp
parent306ac20464cf6f91db61ed4cf7ca1f71792efdbd (diff)
parent7c2b1325e9816267f7144f5a482130e15696e5d0 (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 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: Ifb40e1d2b3f2fa7567ac7d5ed448ba60797e93ca 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