summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-11-20 23:07:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-20 23:07:36 +0000
commit452511566d0199cd2a35f6d2d3e2e3740cda3538 (patch)
tree60919697513faca4a28ef64fc891d3a95e32907a /libs/androidfw/FileStream.cpp
parent79faee967bea75045402c1ad6d71ee19b9954b77 (diff)
parentb291a9ffdae32d3beb7eec3015e32ce2f0757510 (diff)
Merge "input jni: don't depend on unique_fd cast to int" into main am: 47cf4f1645 am: 994cbc047d am: b291a9ffda
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2835674 Change-Id: Ia84b28d79a2a7b2d80e43bc7eef64898ce62063f 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