OSDN Git Service

am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings."
authorFyodor Kupolov <fkupolov@google.com>
Tue, 19 May 2015 21:17:48 +0000 (21:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 May 2015 21:17:48 +0000 (21:17 +0000)
commitdb80e588c0f2c585e3dddb79fdd35b3f50ba8bb2
tree7f1c95b0f6b0024f24fd6e69b916ff5e32f48104
parent4dda36a220ee646e4a22bd2d6f44be5b1c6d568b
parente84a5eac2cff89a2e380935ee10c685e4b1a58f0
am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings."

* commit 'e84a5eac2cff89a2e380935ee10c685e4b1a58f0':
  Remove the check hasMultipleUsers in Settings.
src/com/android/settings/SettingsActivity.java
src/com/android/settings/users/UserSettings.java