| commit | 85a23a76385731774e173898899ff06fdb83cd7c | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 04:01:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 04:01:32 2023 +0000 |
| tree | 437fc6e0abcda691db1c4a10719ba05558bc4e96 | |
| parent | 2efdf170d372ca21337b6851dc55ec8564e63c3c [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: Ib541ddf5bf4e0e8aadde37b63ffc86e41aec0e80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>