tree d393abc7cff699ec33645366ac211b39dba802bd
parent 432b3b38ff01dbdd467d61a9cc6de9b4185479a8
parent 50dcdb177e082d69d700ec650d104bc1cf43ddaa
author Pinyao Ting <pinyaoting@google.com> 1671588307 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671588307 +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: 50dcdb177e -s ours

am skip reason: subject contains skip directive

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

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