summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-05-04 14:09:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 14:09:49 +0000
commita67b06217876949438754b8eea99b5d3c73c7afe (patch)
tree8aa2c0abc2f4d7c0c5bdce6a29eadc5c11bd1b6f /libs/androidfw/FileStream.cpp
parent4a654f9025a6459eec45664411380f2964ab250d (diff)
parent3338659fc16b2fb62235a1dda3812f61fee569a9 (diff)
[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -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: I67560d366b018b1e3d1a43a8ed1ca21df9402b3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions