OSDN Git Service

Merge "Fix ioctl parameter"
authorElliott Hughes <enh@google.com>
Thu, 29 Oct 2015 20:41:28 +0000 (20:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Oct 2015 20:41:28 +0000 (20:41 +0000)
commit5cd32f73d8b5e6db60d397d102e5b1b193a76c77
tree2e53ddc9a281151d6b823cf004977f3fbd1f6f1d
parentd3c7060ba53d87c58103b1776815fea9d29e39cc
parent0eaad8ce8ceaa4b730b0be8c149f389647fbdab0
Merge "Fix ioctl parameter"
am: 0eaad8ce8c

* commit '0eaad8ce8ceaa4b730b0be8c149f389647fbdab0':
  Fix ioctl parameter