tree 51223b508912b12d2108bc0d81a62e279fcb6054
parent 450cfd189bfcd51da7c94a55199281be45689f1d
parent 33b6de4b94e018b3cb621db5eabcb3a4f18bdd3d
author Elliott Hughes <enh@google.com> 1423455313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423455313 +0000

am 33b6de4b: am d55d8dac: Merge "prevent ioctl_init() to write outside buffer"

* commit '33b6de4b94e018b3cb621db5eabcb3a4f18bdd3d':
  prevent ioctl_init() to write outside buffer