summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 16:14:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 16:14:13 +0000
commitf12c2f16ff59bc41eb9c8242534b5fafa21a193c (patch)
treecd2a90a88bbf0e6c0242fc8533ff24524621ec71 /libs/androidfw/ZipFileRO.cpp
parent9856f123dde3b0091da73007a519036f2e8f8a29 (diff)
parentb9a82b6cf2ad6e6bc30de6563322ed943595778c (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: b9a82b6cf2 -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: I50d0d2d8b13c0d1fc61089459f556cbf67b460eb 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