| commit | 6b62ae8132bc92886d537e7965b253d46e1002d4 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 04:51:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 04:51:57 2023 +0000 |
| tree | 92d0190fef6613474878c7c0a27e35b873a124cf | |
| parent | 7cb70b90cb0de232edef763c03d83bacc05ff5ae [diff] | |
| parent | 49e063af2fac03c9e9e756a291cf6954fce46af7 [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 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: I197fd050109449861fe1924cd291126539666ba0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>