PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logd: Add Developer settings for size, merge conflict issue

Browse Source 
- mLogdSize dropped by merge conflict resolution

Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e985
This commit is contained in:
Mark Salyzyn
2014-05-06 08:44:57 -07:00
parent 6b5bcd2138
commit c6d03a828e
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/DevelopmentSettings.java
View File

@@ -213,6 +213,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private ListPreference mOverlayDisplayDevices; private ListPreference mOverlayDisplayDevices;
private ListPreference mOpenGLTraces; private ListPreference mOpenGLTraces;
private ListPreference mSimulateColorSpace; private ListPreference mSimulateColorSpace;
private ListPreference mLogdSize;
private CheckBoxPreference mUseNuplayer; private CheckBoxPreference mUseNuplayer;