From c6d03a828ed3546a229622bff14620a883a0c609 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 6 May 2014 08:44:57 -0700
Subject: [PATCH] logd: Add Developer settings for size, merge conflict issue

- mLogdSize dropped by merge conflict resolution

Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e985
---
 src/com/android/settings/DevelopmentSettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 02045ab5856..848be00813f 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -213,6 +213,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private ListPreference mOverlayDisplayDevices;
     private ListPreference mOpenGLTraces;
     private ListPreference mSimulateColorSpace;
+    private ListPreference mLogdSize;
 
     private CheckBoxPreference mUseNuplayer;