tree 6ef36ef8406503defeb7f47bebfe548d2dd8d326
parent e01d4b35664070953adc28e8cc77c579579d41a6
parent 5fb269e4582d97a541eccf39c2484d8d2a8e16ab
author Adrian Roos <roosa@google.com> 1430272758 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430272758 +0000

am 5fb269e4: am 59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev

* commit '5fb269e4582d97a541eccf39c2484d8d2a8e16ab':
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils