am f4db2de: am 1b29a95: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

Author: Robert Schaub

docs/html/training/tv/start/hardware.jd

@@ -163,7 +163,7 @@ if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
         android:required="false"/>
 <uses-feature android:name="android.hardware.nfc"
         android:required="false"/>
-<uses-feature android:name="android.hardware.gps"
+<uses-feature android:name="android.hardware.location.gps"
         android:required="false"/>
 <uses-feature android:name="android.hardware.microphone"
         android:required="false"/>