summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-12-22 23:11:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-22 23:11:11 +0000
commitbd7db4feec6790ccc76fc4a12e3bc1019747cb05 (patch)
tree232289210c49b9820b46416e877b045c3425eb8f /libs/androidfw/ApkParsing.cpp
parentd8205b22c4c42e697558451a167ea277e7f308df (diff)
parentbdf24e1c3bf6c756155e517f5d0d45a508008637 (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: 4aea16bab3 -s ours am: 21ce858e1f -s ours am: bdf24e1c3b -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: Ic97669cf692bd2477c464f7ba70eb7a231560956 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