diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 41ec0fa4d63..7fc121ec3b8 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -355,6 +355,12 @@
                 android:summary="%s"
                 android:title="@string/simulate_color_space" />
 
+        <ListPreference
+                android:key="debug_hw_renderer"
+                android:title="@string/debug_hw_renderer"
+                android:entries="@array/debug_hw_renderer_entries"
+                android:entryValues="@array/debug_hw_renderer_values" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="media_category"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index b90466e898d..7fd1072a285 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -159,6 +159,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
     private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
     private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
+    private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";
     private static final String DEBUG_LAYOUT_KEY = "debug_layout";
     private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
     private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
@@ -304,6 +305,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private SwitchPreference mDebugLayout;
     private SwitchPreference mForceRtlLayout;
     private ListPreference mDebugHwOverdraw;
+    private ListPreference mDebugHwRenderer;
     private ListPreference mLogdSize;
     private ListPreference mLogpersist;
     private ListPreference mUsbConfiguration;
@@ -469,6 +471,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mDebugLayout = findAndInitSwitchPref(DEBUG_LAYOUT_KEY);
         mForceRtlLayout = findAndInitSwitchPref(FORCE_RTL_LAYOUT_KEY);
         mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
+        mDebugHwRenderer = addListPreference(DEBUG_HW_RENDERER_KEY);
         mWifiDisplayCertification = findAndInitSwitchPref(WIFI_DISPLAY_CERTIFICATION_KEY);
         mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
         mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
@@ -779,6 +782,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         updateShowHwScreenUpdatesOptions();
         updateShowHwLayersUpdatesOptions();
         updateDebugHwOverdrawOptions();
+        updateDebugHwRendererOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
@@ -1323,6 +1327,31 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         updateDebugHwOverdrawOptions();
     }
 
+    private void updateDebugHwRendererOptions() {
+        String value = SystemProperties.get(ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mDebugHwRenderer.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mDebugHwRenderer.setValueIndex(i);
+                mDebugHwRenderer.setSummary(mDebugHwRenderer.getEntries()[i]);
+                return;
+            }
+        }
+        mDebugHwRenderer.setValueIndex(0);
+        mDebugHwRenderer.setSummary(mDebugHwRenderer.getEntries()[0]);
+    }
+
+    private void writeDebugHwRendererOptions(Object newValue) {
+        SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        pokeSystemProperties();
+        updateDebugHwRendererOptions();
+    }
+
     private void updateDebugLayoutOptions() {
         updateSwitchPreference(mDebugLayout,
                 SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false));
@@ -2544,6 +2573,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         } else if (preference == mDebugHwOverdraw) {
             writeDebugHwOverdrawOptions(newValue);
             return true;
+        } else if (preference == mDebugHwRenderer) {
+            writeDebugHwRendererOptions(newValue);
+            return true;
         } else if (preference == mShowNonRectClip) {
             writeShowNonRectClipOptions(newValue);
             return true;