tree 4e10422c52f77acf9ee0842b7df1e04e6a32af19
parent c37d549f2a325197d6677b6f296d4f8f36708838
parent 00dc9638d94b260fd68df28f9e69a0812ce5ed02
author Pinyao Ting <pinyaoting@google.com> 1671585899 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671585899 +0000

[automerger skipped] [Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish" am: 4a34020ffc am: 51361020b4 -s ours am: 95f6f97d5b -s ours am: bd380fb2bd -s ours am: b26a560df5 -s ours am: 00dc9638d9 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750216

Change-Id: I4fa111581320535c9d4b270835aa436222e17aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>