summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Peiyong Lin <lpy@google.com> 2023-10-17 18:12:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-17 18:12:33 +0000
commit568e298afb4412d15b9a7ce404b594be09dc65cb (patch)
tree5ee4d462dc1ba63c5b832fe5bb95dd204ba4394f /libs/androidfw/FileStream.cpp
parent9438e62a617b13e59d62cc9d8e595ddc10c36fe0 (diff)
parent540dcd1096ab16402ee5476bfcef37b1fccc58b6 (diff)
[automerger skipped] Merge "Allow per-app opt in to use system ANGLE." into main am: 6b30dd666d am: 94eb350c8d -s ours am: 540dcd1096 -s ours
am skip reason: Merged-In I83b3c2ccbe7cb38f71418afde4254f48153ab6b3 with SHA-1 b3199f4c04 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2791366 Change-Id: I182871ea344f37b4338878a7afdbd96d428078ee 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