OSDN Git Service

Merge "Fix ioctl parameter" am: 0eaad8ce8c
authorElliott Hughes <enh@google.com>
Thu, 29 Oct 2015 20:44:35 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Oct 2015 20:44:35 +0000 (20:44 +0000)
commit8185d3d8ba3dec0f26ade8cd4764d5f09cc00bcc
tree5ccc47b9354d15cc40f2c4ea520c7f47372fe53c
parentaebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b
parent5cd32f73d8b5e6db60d397d102e5b1b193a76c77
Merge "Fix ioctl parameter" am: 0eaad8ce8c
am: 5cd32f73d8

* commit '5cd32f73d8b5e6db60d397d102e5b1b193a76c77':
  Fix ioctl parameter
Utils.cpp