summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2023-09-08 19:06:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-08 19:06:00 +0000
commit74bf93585652aad03a88715b27a41d9539f4a035 (patch)
tree4aa4e5030f7014f5b14242f206b05cfd0185b6a3 /libs/androidfw/FileStream.cpp
parentad7b1034a3aeba3d3468d51b281bf86f33d7ec43 (diff)
parent4e4ddec27f0c5d02fd2b292ee2b8055732bbed4b (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 685b676892 -s ours am: 4e4ddec27f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24688110 Change-Id: Ia7c605b027ea520a3c32d6d33d764d651ef11159 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