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