summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 15:51:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 15:51:35 +0000
commita207bf4e3bc911704bdba6552b2a4d4af3d3dbb1 (patch)
treef464963e0f45f4726ff5cde30c87ca6fd5918ef1 /libs/androidfw/ObbFile.cpp
parent76e1226f150b700b16e6d8bd17c0cedea1906454 (diff)
parent89376a51cfb4520db1e189c67c00109f1c19ebae (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: 89376a51cf -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: Ifae6625d71f0e51da571a4288c10ac03b172625f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions