summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Austin Borger <borgera@google.com> 2023-08-22 16:54:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-22 16:54:26 +0000
commitef579d627bdae0f378d04b521e693d4a096b7de7 (patch)
treeb36f37fe83598ee5213ab52080f50ccc075b1bcc /libs/androidfw/FileStream.cpp
parent11d39b1942534c6f530110c6a3bae7fb5fdb0848 (diff)
parent0b822b8ba35b04fe17e29cae0e10d6e8fe777258 (diff)
[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into udc-qpr-dev-plus-aosp am: 0b822b8ba3 -s ours
am skip reason: Merged-In I7aee6696f149244c643ec1399815155f3f562538 with SHA-1 b56b7e54b6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24465396 Change-Id: Iad20897105ef9b6e8f0d52102456fcf696478c21 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