diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 20:35:32 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 20:35:32 -0800 |
| commit | d8c29b8f2327a2df83e606e286d053cfce28ba16 (patch) | |
| tree | 84633dc0628aadf6e9ef9d1f516daeb55794e128 /src/com/android/settings/users/EditUserInfoController.java | |
| parent | d35875e92b00910f43b4227f22b673a66ca59c6d (diff) | |
| parent | 9738c9f6a386eb782d1e98962c6407304eb98f33 (diff) | |
| download | packages_apps_Settings-d8c29b8f2327a2df83e606e286d053cfce28ba16.zip packages_apps_Settings-d8c29b8f2327a2df83e606e286d053cfce28ba16.tar.gz packages_apps_Settings-d8c29b8f2327a2df83e606e286d053cfce28ba16.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Settings into cm-13.0
Android 6.0.1 release 22
Change-Id: Ided010bc125199d47ca59d10f0ed5032a26632ff
Diffstat (limited to 'src/com/android/settings/users/EditUserInfoController.java')
| -rw-r--r-- | src/com/android/settings/users/EditUserInfoController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java index ab77101..a4c07bd 100644 --- a/src/com/android/settings/users/EditUserInfoController.java +++ b/src/com/android/settings/users/EditUserInfoController.java @@ -37,8 +37,8 @@ import android.widget.EditText; import android.widget.ImageView; import com.android.settings.R; -import com.android.settings.Utils; -import com.android.settings.drawable.CircleFramedDrawable; +import com.android.settingslib.Utils; +import com.android.settingslib.drawable.CircleFramedDrawable; /** * This class encapsulates a Dialog for editing the user nickname and photo. |