diff options
| author | 2023-09-29 03:51:27 +0000 | |
|---|---|---|
| committer | 2023-09-29 03:51:27 +0000 | |
| commit | 58d8f1e2de753fef417ec59619c4b2cf426868b0 (patch) | |
| tree | 6afd8b07098bd2b755c44f418723fa664f851d8c /libs/androidfw/ObbFile.cpp | |
| parent | 655266f89fcb2d04a60fd886d12bb56f6329f815 (diff) | |
| parent | ae621908fd12dce514af28c879aaf56d51e269ec (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: ae621908fd -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: I215f0827a6daf409f3a728277052876a82d8bd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions