| commit | 727e36ff411ec7cb82871a7968ffb7c14eee977a | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 06:10:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 06:10:36 2023 +0000 |
| tree | 18ba80092f618023f219d7237830f2d7b67d27a5 | |
| parent | 42f6cb8e0207a4deb8ad08ef6ac2775951bdba9a [diff] | |
| parent | f59cf055438c26828f9600ad46dd2a6c2a8eba66 [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: ae621908fd -s ours am: 58d8f1e2de -s ours am: f59cf05543 -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: I1c9036037554901ac2a838b15ab90cfe61149e4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>