summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-25 17:41:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-25 17:41:05 +0000
commit5befd8db51a3a2898dc226229d4d442810797efe (patch)
tree13b4e0457cd6c2c359381d8d4bb33c74e5e869b1 /libs/androidfw/FileStream.cpp
parent8d98564285352f1349cd87667865323124299dd2 (diff)
parenta10cfa534811f81aef60365ff095a5d68d943644 (diff)
Merge changes from topic "user-key-rename" into main am: 7490fc591b am: bf42e62c19 am: a10cfa5348
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796609 Change-Id: I23e2010b47065fb737a59b6f8500c93ca68ed830 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