diff options
| author | 2023-05-04 15:52:23 +0000 | |
|---|---|---|
| committer | 2023-05-04 15:52:23 +0000 | |
| commit | b9a82b6cf2ad6e6bc30de6563322ed943595778c (patch) | |
| tree | f464963e0f45f4726ff5cde30c87ca6fd5918ef1 /libs/androidfw/ZipFileRO.cpp | |
| parent | 8a166617504eff8cdf2053a77a246032433b482f (diff) | |
| parent | 091e1c3905b063d8f90176c109c2fd423bd5a6e5 (diff) | |
[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -s ours am: a67b062178 -s ours am: 8f331aabeb -s ours am: 091e1c3905 -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464
Change-Id: Ia76c037582ff9e7ab9f8a1f05fc019d96a7697af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions