OSDN Git Service

Merge "Prevents users from being added if device is not provisioned" into nyc-dev
authorUdam Saini <udam@google.com>
Thu, 31 Mar 2016 20:13:39 +0000 (20:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 31 Mar 2016 20:13:40 +0000 (20:13 +0000)
commite20deea7112a17ac4799f6924cddc27b4678f791
tree2bbbe9c6752a1fd0e934bf0f8333eedae69d40f1
parentcb77df22609179aacf985818fd512719f7ea98f7
parent679f7ad07e4e2a4b4c6645d05bca92790394c2fd
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/MasterClearConfirm.java
src/com/android/settings/users/UserSettings.java