tree d393abc7cff699ec33645366ac211b39dba802bd
parent 2f366064f2f74bbe437f90b759d2457f8100e9a2
parent fd017d9edd059128abbd42c5a8a82045038c4641
author TreeHugger Robot <treehugger-gerrit@google.com> 1671588315 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671588315 +0000

[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours am: 7e1bf5b798 -s ours am: 85671779f6 -s ours am: fd017d9edd -s ours

am skip reason: subject contains skip directive

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

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