diff options
| author | 2023-09-29 06:08:53 +0000 | |
|---|---|---|
| committer | 2023-09-29 06:08:53 +0000 | |
| commit | 51330ec64e52529e5656450012cfb7c2e22d7823 (patch) | |
| tree | 18ba80092f618023f219d7237830f2d7b67d27a5 /libs/androidfw/FileStream.cpp | |
| parent | b8551b77bfe51af866c44d31cd523ccd5b38eaa5 (diff) | |
| parent | 7cb70b90cb0de232edef763c03d83bacc05ff5ae (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: 7cb70b90cb -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: I788209499e3d61805400d82890d6dc92ca9af328
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