summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 20:28:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 20:28:02 +0000
commit65f6794d8a850e6e38f1a557d9c00d3e98106cea (patch)
treea731a05dd2f75880024316c60d3b8f8393fc0541 /libs/androidfw/ApkParsing.cpp
parent72bb18337ce3718d3042e724d592da302dd1cbdd (diff)
parent0f1508499082801c142a7e6bc020742bdb865599 (diff)
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: d7cadc0378 -s ours am: 0bfd492240 -s ours am: 0f15084990 -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: Iefbf44b485b4b78ebefad35e7926c5d4be2bb088 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions