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

am: dc3bb2798a

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

Change-Id: Ia21a7274381dd28c16934d23570962867a08680b
This commit is contained in:
Makoto Onuki
2016-05-13 19:02:35 +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>