summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Peiyong Lin <lpy@google.com> 2023-10-19 21:41:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-19 21:41:09 +0000
commit0aced36ffc29f8ab0b40ef88a13184dd9a045baa (patch)
tree7719534bc6e6dc694441537f5b4ebe49e169ac65 /libs/androidfw/FileStream.cpp
parent8e55cc86affdc5a2d136fb1be1d1078638beb799 (diff)
parenta488ba348ec77f74b943ad43010cd0733d0a500d (diff)
[automerger skipped] Merge "[Cherry-pick] Revert^2 "Revert "Load native GLES driver when specified.""" into main am: d93418c129 am: a488ba348e -s ours
am skip reason: Merged-In I03a662186d386764c9b0dd2b9d8d5ada93823dda with SHA-1 f927f9b5f1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2793961 Change-Id: I0d6c08e5e21b18c09c42f884dfcd65a6f85f9a00 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