summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Roshan Pius <rpius@google.com> 2023-11-15 15:39:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-15 15:39:23 +0000
commit64061f0e7ad98eaa41f5614f0b332a7b86ea5372 (patch)
tree140d8542911a250e9fbbe4f68763a9b753e2b674 /libs/androidfw/FileStream.cpp
parent934966039b2f8766ab21411f9897e72b8d561fd4 (diff)
parent00c53e209a503d64d8504ca15fbc4493bc2cdb0e (diff)
[automerger skipped] Merge "Implementing support for NFC observe mode, polling loop fingerprints and field strength along with their associated APIs." into main am: 63b108b336 am: 00c53e209a -s ours
am skip reason: Merged-In I884527f9271a93997fa47b3764f9fa711cddb6f2 with SHA-1 b8c4f9bf2f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2823611 Change-Id: I2fc167299ebf67610f04e346d9a78c6f6d23ec4f 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