tree f7c0b9b371b1501828610059b04b7b20e2daf82e
parent 56ddde2f4ff05a6488e5bb2cd4d37abdfea5ce63
parent 3f1534eb7766e74e981b1fb1a1c9535adea5b5f2
author TreeHugger Robot <treehugger-gerrit@google.com> 1671739483 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671739483 +0000

[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 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: I48567c4612616682a96ea3f85fe6a22ac387a921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>