diff options
| author | 2023-09-29 02:52:33 +0000 | |
|---|---|---|
| committer | 2023-09-29 02:52:33 +0000 | |
| commit | 4d8bb9afc5148e986a63e0f0d72577c92c8fa34f (patch) | |
| tree | 7557c2f9867fc1175483c2f530c4c0be46a9ef07 /libs/androidfw/ObbFile.cpp | |
| parent | c02513e08817049128d7aa700feae39d9c8f6d9b (diff) | |
| parent | d06e0acf00fc635135021fc519377388cd49b5bf (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 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: I5092d539b092d113487d2738d68c80068f04a4ce
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