tree e3b77187c9d08bcdeca7ba3df4b7779434aaef68
parent 9621b79396303037a86eb2639035b12080c858bf
parent c6c843fbe8fb8d9bdd012a472e22970ee89b9d24
author Jim Miller <jaggies@google.com> 1413589961 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413589961 +0000

am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev

* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption