Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev

am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
This commit is contained in:
Wei Wang
2016-06-02 17:22:59 +00:00
committed by android-build-merger
3 changed files with 0 additions and 16 deletions

View File

@@ -7226,9 +7226,6 @@
<!-- Name of the setting to disable the automatic update -->
<string name="ota_disable_automatic_update">Automatic system updates</string>
<!-- Name of the setting to launch Location Dogfood Tools -->
<string name="location_dogfood_tools">Location Dogfood Tools</string>
<!-- Label for category for data usage [CHAR LIMIT=30] -->
<string name="usage">Usage</string>

View File

@@ -100,13 +100,6 @@
<intent android:action="com.android.settings.action.DEMO_MODE" />
</PreferenceScreen>
<!--TODO(b/28251942) Remove before ship -->
<PreferenceScreen
android:key="location_dogfood_tools"
android:title="@string/location_dogfood_tools">
<intent android:action="com.android.apps.location_dogfood.MAIN" />
</PreferenceScreen>
<PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category">