tree 3e5150c3d7c8a3a3ed63740a8c565ec3aab55b88
parent 836e78608dcb16a490330e051416787df2ee14db
parent e9623fede7a89d61952f983f0c0a294fc3563c9c
author Elliott Hughes <enh@google.com> 1427750089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427750089 +0000

am e9623fed: Merge "Fixed type mismatch for ioctl(BLKGETSIZE)"

* commit 'e9623fede7a89d61952f983f0c0a294fc3563c9c':
  Fixed type mismatch for ioctl(BLKGETSIZE)