summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 14:23:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 14:23:44 +0000
commitd393f944b091d971d8a74dcfa3c8ace68031a385 (patch)
treec4336a9444d7a722b318d1d92545213982826c20 /libs/androidfw/ZipFileRO.cpp
parentb575efcc0b49e591a84706fe14c239054e94d577 (diff)
parentfb809ba82cd06bad14f3eea202f1b843a188ac56 (diff)
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd141 -s ours am: fb809ba82c -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907731 Change-Id: Ib6da092a6e1811247c7b7374915866d994903941 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