summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 14:25:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 14:25:43 +0000
commit53261f62e08f56aa129ca722e21c09e1f0aad3f8 (patch)
treec4336a9444d7a722b318d1d92545213982826c20 /libs/androidfw/ZipFileRO.cpp
parent5a2e6ee0e8376fd44f32c05819017edbfe198f10 (diff)
parentebab1eac42a20696a197af95c482eb1826972b8e (diff)
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b28f -s ours am: 71e2d68ec8 -s ours am: ebab1eac42 -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef67c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22905557 Change-Id: I78f6eabab4af1d7f08f4730492c4edd62261b975 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