summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Roshan Pius <rpius@google.com> 2023-12-01 18:49:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-01 18:49:17 +0000
commit7110758512f7b7ec1214e669d3d7990b6577eabf (patch)
treea80dc37b01fe9665a624af909661d3b3f450c352 /libs/androidfw/FileStream.cpp
parent25fd36a5ae45bf6aa20e8c9b9181787ad0f76756 (diff)
parent7e349899f1ce1fc3c3593e56fdce385b8b379f52 (diff)
[automerger skipped] Merge "Created empty framework-nfc non-updatable module" into main am: a7a5a26199 am: 7e349899f1 -s ours
am skip reason: Merged-In Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e with SHA-1 0fa80893da is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2836853 Change-Id: I8a149b95b14f6a19d2ae32b59f6805344f1a12c7 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