OSDN Git Service

Merge "Support default, pattern, pin and password encryption types"
authorPaul Lawrence <paullawrence@google.com>
Fri, 14 Feb 2014 15:24:12 +0000 (15:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Feb 2014 15:24:13 +0000 (15:24 +0000)
1  2 
cryptfs.c

diff --cc cryptfs.c
Simple merge