commit f4db2de881d197db0dfd76645dfd7a95b1f8f0de
author Robert Schaub <rschaub@google.com> Thu Jul 16 18:40:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 18:40:37 2015 +0000
tree 8db4e9d549daa167c791bf8f4743e8f7d031a428
parent 8c5f34de91fc1fb148bbee9f868d32ff6103a70a
parent 1b29a95789c29174d5e4d526f6449c2c354ef3b3

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

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

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

diff --git a/docs/html/training/tv/start/hardware.jd b/docs/html/training/tv/start/hardware.jd
index 57651e6..5747b56 100644
--- a/docs/html/training/tv/start/hardware.jd
+++ b/docs/html/training/tv/start/hardware.jd
@@ -163,7 +163,7 @@
         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"/>