tree 5ccc47b9354d15cc40f2c4ea520c7f47372fe53c
parent aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b
parent 5cd32f73d8b5e6db60d397d102e5b1b193a76c77
author Elliott Hughes <enh@google.com> 1446151475 +0000
committer android-build-merger <android-build-merger@google.com> 1446151475 +0000

Merge "Fix ioctl parameter" am: 0eaad8ce8c
am: 5cd32f73d8

* commit '5cd32f73d8b5e6db60d397d102e5b1b193a76c77':
  Fix ioctl parameter