commit | 9e96ae633498407224c67aeef6ed5d61c5fb2b5d | [log] [tgz] |
---|---|---|
author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 04:03:17 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 04:03:17 2023 +0000 |
tree | 437fc6e0abcda691db1c4a10719ba05558bc4e96 | |
parent | cf11a6193f676024bb5a30625ed4a300cfbda59c [diff] | |
parent | 6dfd94a18596aeab7072ec432c5d97044505e0eb [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: 6dfd94a185 -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: I7dbdbbe9b0ebe824b1cf780a43565b60ab220759 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>