summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-25 17:42:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-25 17:42:27 +0000
commit673d557fc02baa467d9a46c15b7bfef9427b3647 (patch)
tree046c689bc2657f70c09e9b382d748fa6ae3f9c47 /libs/androidfw/FileStream.cpp
parentcc638418ac9b92f1f96adf6463ac91ed4c41295b (diff)
parentf04125092401b553ee143fbd9d030cdc247313c9 (diff)
Merge changes from topic "user-key-rename" into main am: 7490fc591b am: 4640c019cb am: f041250924
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796609 Change-Id: I7d5f8dad51d33a8efa98733a6e7ebf13208ba2f3 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