OSDN Git Service

Merge "Support default, pattern, pin and password encryption types"
authorPaul Lawrence <paullawrence@google.com>
Fri, 14 Feb 2014 15:24:59 +0000 (15:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Feb 2014 15:25:01 +0000 (15:25 +0000)
commita9f387bdf0a836de8bcb12a46a5cdfcb544fbb1a
tree228c451ee85ae004dc62b1eedc79522efa40fdf9
parentee904d4d3ee710f292b607224a6017e843827360
parent8e39736f91a08961cf59c87075e61d9026833b50
Merge "Support default, pattern, pin and password encryption types"