tree 6a29cb7661784a715ace48a67cb5842d1347d582
parent f2114b8d6da601710fb836d19d4f8b24093b7e24
parent b1f38886516ab372c3d9af12468f4c51091317ec
author Elliott Hughes <enh@google.com> 1427741202 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427741202 +0000

am 3e46f4af: am 9c39510e: am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"

* commit '3e46f4af4f52aee324601b449abf9219bfd6b362':
  toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)