summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-01-11 21:27:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-11 21:27:09 +0000
commit58e200f57c6e59c21ace703abc59995a00aa352c (patch)
tree8a0a74f9804293280cdfeea504e8b61cc9d30cf0 /libs/androidfw/ApkParsing.cpp
parent69baf091ecad0d82a55bdda7a8f26725c52281c3 (diff)
parentf6b5eff1995aa2019a53f39ea42026524dbe15ed (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: f6b5eff199 -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: I6c4fba9d2d8a27d6f733519fa5774e906088e76f 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