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

am: f4ffd6daff

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

Change-Id: I7689577ee57a58d1abdb4690c453f6a9cadfa251
This commit is contained in:
Makoto Onuki
2016-05-13 18:59:31 +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>