diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-24 18:12:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-24 18:12:15 +0000 |
| commit | ee47e0219e45ea3a280b07ae011aa498f86430d0 (patch) | |
| tree | 04c78a967a7015bba81a8f98f2acf63bd7e7d503 /src/com/android/settings | |
| parent | d57c79bcc37049c914598fe652091e9bd4599eee (diff) | |
| parent | 877e9de67b69c77bd34452c28b1b0a4739da1d90 (diff) | |
| download | packages_apps_Settings-ee47e0219e45ea3a280b07ae011aa498f86430d0.zip packages_apps_Settings-ee47e0219e45ea3a280b07ae011aa498f86430d0.tar.gz packages_apps_Settings-ee47e0219e45ea3a280b07ae011aa498f86430d0.tar.bz2 | |
am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
* commit '877e9de67b69c77bd34452c28b1b0a4739da1d90':
Update enable oem unlock warning
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index f64b16b..f3ee021 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -1335,7 +1335,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment new AlertDialog.Builder(getActivity()) .setTitle(R.string.confirm_enable_oem_unlock_title) .setMessage(R.string.confirm_enable_oem_unlock_text) - .setPositiveButton(R.string.yes, onConfirmListener) + .setPositiveButton(R.string.enable_text, onConfirmListener) .setNegativeButton(android.R.string.cancel, null) .create() .show(); |