summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 15:52:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 15:52:19 +0000
commit8a166617504eff8cdf2053a77a246032433b482f (patch)
treef464963e0f45f4726ff5cde30c87ca6fd5918ef1 /libs/androidfw/ZipFileRO.cpp
parent5097485c47bc1cd54b8a712349908afdb83edbfe (diff)
parent98f823be69108712388d14f5f4033eba3c2d6e7c (diff)
[automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours am: 98f823be69 -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: I256b02ce4d6083f12ee4388fff29e495c63d7cc6 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