| commit | 7fa1b6db86debff05eded2e5b6094c5d34aa18b2 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 02:50:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 02:50:32 2023 +0000 |
| tree | f4bc2a925f60c139ebc386dce7753f976ae7e3c4 | |
| parent | 282f80d8382ee6f934d451d2bfa42abfed7b58b0 [diff] | |
| parent | 4420eab7414e740529374f94f5448a2a9b6d37ba [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: b4c6497849 -s ours am: 8b6c78c724 -s ours am: 4420eab741 -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: I5564922eac0a0f5979676d94d9c8f3b102db70c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>