tree b9be171108d2a043ba0a9e9aa64d69dca89d5b27
parent 2e07613289ee6c20840e073823acfb0354a6bee2
parent 5b6d285de8bd96b70f0945dfd0e66cc43f780bb1
author TreeHugger Robot <treehugger-gerrit@google.com> 1671742648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671742648 +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: 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: I8666ef4b3a3ad0040c3691522e3e1b542f8282fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>