summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 15:09:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 15:09:54 +0000
commit89376a51cfb4520db1e189c67c00109f1c19ebae (patch)
tree7580bdf1e430155969758ca08c6a567a665dba66 /libs/androidfw/ZipFileRO.cpp
parentfbe2d6af1c6cf4f6ec9d9d33f72b61e520be39de (diff)
parent53261f62e08f56aa129ca722e21c09e1f0aad3f8 (diff)
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b28f -s ours am: 71e2d68ec8 -s ours am: ebab1eac42 -s ours am: 53261f62e0 -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: I49e29d2e12236b58a4ca6cb98d4c7406f573e169 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