OSDN Git Service

am babba576: Merge "Enable properties in ext4enc"
authorPaul Lawrence <paullawrence@google.com>
Fri, 1 May 2015 15:34:27 +0000 (15:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 May 2015 15:34:27 +0000 (15:34 +0000)
* commit 'babba576ba0d1b6fb69c849848c8b01c8b585e24':
  Enable properties in ext4enc

1  2 
cryptfs.c

diff --cc cryptfs.c
Simple merge