summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2023-02-23 23:21:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-23 23:21:18 +0000
commit70d3455a6700721fa58942cedfdc18502b16d01c (patch)
tree4de765a00a97077ba8eb643c2cce25d55b4d4fbb /libs/androidfw/ApkParsing.cpp
parent23ce4b9eb0625e0f595eb239ebe4cc80bcc9acee (diff)
parentdd99369f033df39ce49e38b7160d112b2280d48b (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: 22ed688d59 -s ours am: 143ae40ded -s ours am: dd99369f03 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572 Change-Id: I075d74b43772aeb745e35e2990c50eaac7be44e6 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