tree 6998afc5dd15fc8b7cd623796fa9d949bb06d8c6
parent 5bb72554549c5cc722d5666180d1219b33e1f70a
parent a2ced3e879458786edf715a0016293791db7fd65
author Kenny Guy <kennyguy@google.com> 1423165176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423165176 +0000

am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev automerge: eeb43fb

* commit 'a2ced3e879458786edf715a0016293791db7fd65':
  Only switch user if current user is being wiped