tree db6343ae66a916521d76f3f904534eaab11d442b
parent 5498e00728975718c7fb7ffd3af732c5b9211e45
parent 6b74b34a32b3904e2287f331d5ba18b90de85687
author Pinyao Ting <pinyaoting@google.com> 1695947907 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695947907 +0000

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4f2 am: 87de7ffc2c -s ours am: 285b8a1bc9 -s ours am: 79be2c9963 -s ours am: 39abde021d -s ours am: 6b74b34a32 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e36 is already in history

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

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