| commit | 4ce1a5bbc91361498e2262b576f5d73b17dd40d3 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 06:09:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 06:09:48 2023 +0000 |
| tree | 18ba80092f618023f219d7237830f2d7b67d27a5 | |
| parent | 51330ec64e52529e5656450012cfb7c2e22d7823 [diff] | |
| parent | 6b62ae8132bc92886d537e7965b253d46e1002d4 [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: 0542b70df1 -s ours am: 49e063af2f -s ours am: 6b62ae8132 -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: I6e2b0eed8c08f3b98b069b6fd29ad9cd0590ac6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>