diff options
| author | 2023-09-29 06:07:04 +0000 | |
|---|---|---|
| committer | 2023-09-29 06:07:04 +0000 | |
| commit | e123886ba29093f3d09ecc22610b83dd51f3d646 (patch) | |
| tree | 18ba80092f618023f219d7237830f2d7b67d27a5 /libs/androidfw/misc.cpp | |
| parent | 9ce9a575e59a8ce0f4eec8c4a8918beb649f538a (diff) | |
| parent | 1010f4ce9ba00f593195fa7e8f3b53f857a533d1 (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: 85a23a7638 -s ours am: 1010f4ce9b -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: Ia5023cb5c09ca97cd116e71580f9e8cec0fb9ea4
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