summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 15:50:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 15:50:48 +0000
commit83bf723d595f1d8d7f2f33f652c29ba1766926c4 (patch)
treef464963e0f45f4726ff5cde30c87ca6fd5918ef1 /libs/androidfw/ObbFile.cpp
parent39a1daa6707587fb8c8852c66ff4f58b28b5d717 (diff)
parent0fca42b79b53259fd9bca4ed4b6caf8143f5d752 (diff)
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd141 -s ours am: fb809ba82c -s ours am: d393f944b0 -s ours am: 0fca42b79b -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: I3353e101d872fa550ae153afd4ad4286f8210f53 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