tree 17878b3d5f64c9de966c154fcabf0c86d5e98349
parent 7277d5d97f2b873582dbd60a63a22da452d96ff9
parent 20329dcb37fffca1de3ded6b58341e87cc43c4a9
author Amith Yamasani <yamasani@google.com> 1351645659 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351645659 -0700

am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev

* commit '20329dcb37fffca1de3ded6b58341e87cc43c4a9':
  QS uses nickname for multiuser and profile name for singleuser.