tree 15ffef3bacd2d4ac05767c5f0c81cd1af858cafe
parent 8117047ac716df28934b0e1850dcff34416e2793
parent 114bf32f9cec80cb7ec8c418c41f044bce2ffd85
author Geoffrey Borggaard <geoffreyb@google.com> 1377799431 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377799431 -0700

am 114bf32f: am 06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev

* commit '114bf32f9cec80cb7ec8c418c41f044bce2ffd85':
  UserManagerService upgrades users on first restart.