Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / a49288327401c0a8b35dbe46157b0ac28d6d72c3^1..a49288327401c0a8b35dbe46157b0ac28d6d72c3 / .
commita49288327401c0a8b35dbe46157b0ac28d6d72c3[log] [tgz]
authorRobert Schaub <rschaub@google.com>Thu Jul 16 19:56:16 2015 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>Thu Jul 16 19:56:16 2015 +0000
treed6601c20cce603c4852eab3c9f52bcbc93b44d97
parent953dd1c831030f435034abe458d0b1a2afacded2 [diff]
parentd73354007291ad548dbeca0a756e54074aee7828 [diff]
am d7335400: am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

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

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"/&gt;
 &lt;uses-feature android:name="android.hardware.nfc"
         android:required="false"/&gt;
-&lt;uses-feature android:name="android.hardware.gps"
+&lt;uses-feature android:name="android.hardware.location.gps"
         android:required="false"/&gt;
 &lt;uses-feature android:name="android.hardware.microphone"
         android:required="false"/&gt;