diff options
| author | 2023-09-29 04:51:37 +0000 | |
|---|---|---|
| committer | 2023-09-29 04:51:37 +0000 | |
| commit | 7cb70b90cb0de232edef763c03d83bacc05ff5ae (patch) | |
| tree | 92d0190fef6613474878c7c0a27e35b873a124cf /libs/androidfw/misc.cpp | |
| parent | 198e4c3ca98dbacec45b9b08180cae57a58def38 (diff) | |
| parent | 9e96ae633498407224c67aeef6ed5d61c5fb2b5d (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: 9e96ae6334 -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: I67733f8578f5d0c4663bb8fd5a068128a3409ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/misc.cpp')
0 files changed, 0 insertions, 0 deletions