commit f4ffd6daff1a626d196e30cdebcbf913f936714e
author Makoto Onuki <omakoto@google.com> Fri May 13 18:57:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 13 18:57:00 2016 +0000
tree 13f001268910cd85d8d8fa1669c6c63031c1cb3f
parent 54408a74fa7988a66dc5f68704a2751c23485c0e
parent a23cd4614f0341051e85c3dbdb7766d09c089947

Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
am: a23cd4614f

* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
  ShortcutManager: Remove developer option from NYC

Change-Id: Ie49323be5bb7f8b5e258ecb40382463e3cbb847b

res/xml/development_prefs.xml

diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 23fd80a..44cf585 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -378,10 +378,6 @@
             android:key="force_resizable_activities"
             android:title="@string/force_resizable_activities"
             android:summary="@string/force_resizable_activities_summary"/>
-
-        <Preference
-            android:key="reset_shortcut_manager_throttling"
-            android:title="@string/reset_shortcut_manager_throttling" />
      </PreferenceCategory>
 
 </PreferenceScreen>