commit | 6dfd94a18596aeab7072ec432c5d97044505e0eb | [log] [tgz] |
---|---|---|
author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 02:46:25 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 02:46:25 2023 +0000 |
tree | 68949d9fc9b89e23a64c7ab17eb230082ad7dfe8 | |
parent | 6be73d41609cb7bf4e051ef3f8a2b77664cb3319 [diff] | |
parent | d06e0acf00fc635135021fc519377388cd49b5bf [diff] |
[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: a2afc42c9d -s ours am: d06e0acf00 -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: Iabc5c6d15f7e1b25e60c4f0d416d032668921226 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>