summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-12-22 20:58:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-22 20:58:09 +0000
commit4aea16bab37a1dbc3fb46aa98ab5860c75e1a57f (patch)
treef33abaa657d401d54d147fb029bed0513ca73c0a /libs/androidfw/ApkParsing.cpp
parent8a2c66c57a04f3c7b62248b852c65b38d8e98f08 (diff)
parent5b6d285de8bd96b70f0945dfd0e66cc43f780bb1 (diff)
[automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours am: 5b6d285de8 -s ours
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750339 Change-Id: I65980689b3bcf90fe65fca3286a683d73a692447 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