OSDN Git Service

am 8a0fde27: am e9623fed: Merge "Fixed type mismatch for ioctl(BLKGETSIZE)"
authorElliott Hughes <enh@google.com>
Mon, 30 Mar 2015 21:28:10 +0000 (21:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Mar 2015 21:28:10 +0000 (21:28 +0000)
* commit '8a0fde272be430f66b2e5db6236aa732d2ba6efc':
  Fixed type mismatch for ioctl(BLKGETSIZE)

1  2 
cryptfs.c

diff --cc cryptfs.c
Simple merge