OSDN Git Service

Merge "Conditionally expose splice(2) and sync_file_range(2) constants." am: 10c836fe08
authorElliott Hughes <enh@google.com>
Thu, 6 Jul 2017 21:30:54 +0000 (21:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 21:30:54 +0000 (21:30 +0000)
am: 065237718a

Change-Id: If315bb28d5f2b877df7339011f0cae3e7e361d63


Trivial merge