diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-10-24 14:01:04 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-24 14:01:34 +0300 |
commit | bce613db089fa5766ee155807164ef67d4f89134 (patch) | |
tree | f2d133c557715465c426436a347b8d72f35b58b5 /src/com/android/settings/DevelopmentSettings.java | |
parent | 376b2e1ad41d48e05427c723b404c181f2f713b6 (diff) | |
download | packages_apps_Settings-bce613db089fa5766ee155807164ef67d4f89134.zip packages_apps_Settings-bce613db089fa5766ee155807164ef67d4f89134.tar.gz packages_apps_Settings-bce613db089fa5766ee155807164ef67d4f89134.tar.bz2 |
Fix mismerge of root access preference
Change-Id: I05bfbd83de586e934dd5ba9fc766287c16daf9d7
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
-rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index b29fab0..831da73 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -256,7 +256,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private SwitchPreference mShowAllANRs; - private PreferenceScreen mProcessStats; private ListPreference mRootAccess; private Object mSelectedRootValue; |