tree 323a70f496da5bb441b8e84eae6d624b6b6d7e18
parent 5773f9e6dac00ef1a9a08cbfb6a2d42337d2f60c
parent f4faa575c9fc20a8a8e133d6098865b5ce3a7ed2
author Paul Lawrence <paullawrence@google.com> 1392391452 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1392391453 +0000

Merge "Support default, pattern, pin and password encryption types"