diff options
| author | 2023-09-29 02:53:12 +0000 | |
|---|---|---|
| committer | 2023-09-29 02:53:12 +0000 | |
| commit | ae621908fd12dce514af28c879aaf56d51e269ec (patch) | |
| tree | 7557c2f9867fc1175483c2f530c4c0be46a9ef07 /libs/androidfw/FileStream.cpp | |
| parent | 4d8bb9afc5148e986a63e0f0d72577c92c8fa34f (diff) | |
| parent | 4420eab7414e740529374f94f5448a2a9b6d37ba (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 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: I1b300bc975178df62bdb1d747bd37d08ffd7cfbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions