| commit | 42f6cb8e0207a4deb8ad08ef6ac2775951bdba9a | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 06:10:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 06:10:16 2023 +0000 |
| tree | 18ba80092f618023f219d7237830f2d7b67d27a5 | |
| parent | 4ce1a5bbc91361498e2262b576f5d73b17dd40d3 [diff] | |
| parent | 5a8fd865b96e3c4c39ece5ad9b3afcea750bb522 [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: 655266f89f -s ours am: 5a8fd865b9 -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: I0a02d5e80b044767e1059538d73fe1367f48a0d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>