OSDN Git Service

am 86ddbbf4: Merge "Delete password as per block encryption"
authorPaul Lawrence <paullawrence@google.com>
Thu, 7 May 2015 16:16:12 +0000 (16:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 16:16:12 +0000 (16:16 +0000)
* commit '86ddbbf4143daa721b84f0f253022d19d61b6fe3':
  Delete password as per block encryption

1  2 
cryptfs.c

diff --cc cryptfs.c
Simple merge