commit | 49e063af2fac03c9e9e756a291cf6954fce46af7 | [log] [tgz] |
---|---|---|
author | Pinyao Ting <pinyaoting@google.com> | Fri Sep 29 04:04:10 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 04:04:10 2023 +0000 |
tree | 437fc6e0abcda691db1c4a10719ba05558bc4e96 | |
parent | 9e96ae633498407224c67aeef6ed5d61c5fb2b5d [diff] | |
parent | 0542b70df13f9b4cfd17b3d02eb8669c422ec3ff [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 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: I95a9e322b763c016d563b28e0ac47359d90a92c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>