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

am: 446e5a536e

* commit '446e5a536edeef02fa976898b2eca85b22296509':
  ShortcutManager: Remove developer option from NYC

Change-Id: Iecf0fdd286c2154844075b01dbc622ae52fe7c6e
This commit is contained in:
Makoto Onuki
2016-05-13 18:59:30 +00:00
committed by android-build-merger

View File

@@ -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>