tree 808b4298dbbe56b4fa7b44207da4f7e69df44cb5
parent 072877af485d49f11e227c0d22a7bb4a341533d6
parent b1dd4af7c41dc0d73f9431ec7adabc342e13434e
author Elliott Hughes <enh@google.com> 1412615764 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412615764 +0000

am b1dd4af7: Merge "Fix a typo in ioctl usage message."

* commit 'b1dd4af7c41dc0d73f9431ec7adabc342e13434e':
  Fix a typo in ioctl usage message.