tree 0a149997a8996735c331cabc9dcac595ee0a5297
parent 27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02
parent aac4d9fe55f0baabc5a90c6ffc18dd0502ee7799
author Amith Yamasani <yamasani@google.com> 1351644478 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351644478 -0700

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