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

am: a23cd4614f

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

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

View File

@@ -378,10 +378,6 @@
android:key="force_resizable_activities" android:key="force_resizable_activities"
android:title="@string/force_resizable_activities" android:title="@string/force_resizable_activities"
android:summary="@string/force_resizable_activities_summary"/> android:summary="@string/force_resizable_activities_summary"/>
<Preference
android:key="reset_shortcut_manager_throttling"
android:title="@string/reset_shortcut_manager_throttling" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>