| commit | 655266f89fcb2d04a60fd886d12bb56f6329f815 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 03:51:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 03:51:13 2023 +0000 |
| tree | 6afd8b07098bd2b755c44f418723fa664f851d8c | |
| parent | 14e73221151878d845660de8f9e7f25c36c08176 [diff] | |
| parent | 4d8bb9afc5148e986a63e0f0d72577c92c8fa34f [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: 4d8bb9afc5 -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: Ic950b7f3514c9ca8e04bf77f7f684c98efa08145 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>