tree 095b788115ad0d729e712c520bb8291738c69f0b
parent c7f6720e90b897a02e9452aff6d7bb53fc2fa944
parent e8378f43b0d6d25b6a306cd0ac0c4cdcb12aa7a8
author Amith Yamasani <yamasani@google.com> 1347401725 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347401725 -0700

Merge "No multiuser settings for phones" into jb-mr1-dev