commit 322e15a859f19a4ca150e902a0a1642fb210a62d
author Joe Fernandez <joefernandez@google.com> Tue Apr 28 17:28:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 28 17:28:28 2015 +0000
tree 82fd1b7a41e6c98556de75266a6067ff91b0e7f2
parent 6cbaa773bdfce3c09523d0a0c038648187d3812d
parent cd3793c6f20048ce7278f749b35c5788f2a86852

am cd3793c6: am e658285b: am 03cbc278: am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs

* commit 'cd3793c6f20048ce7278f749b35c5788f2a86852':
  docs: Modify Branding guidelines for Android form factors

docs/html/distribute/tools/promote/brand.jd

diff --git a/docs/html/distribute/tools/promote/brand.jd b/docs/html/distribute/tools/promote/brand.jd
index a12e753..cf83a5e 100644
--- a/docs/html/distribute/tools/promote/brand.jd
+++ b/docs/html/distribute/tools/promote/brand.jd
@@ -37,6 +37,18 @@
       <p>If used with your logo, "for Android" should be no larger than 90% of your logo’s size.
       First instance of this use should be followed by a TM symbol, "for Android&trade;".</p>
     </li>
+    <li>"Android TV", "Android Wear" and "Android Auto" may only be used to identify or market
+      products or services with prior approval.  Use "for Android" or "with Android" for all
+      other Android-based products
+      <ul>
+        <li><span style="color:red">Incorrect</span>: "Android TV Streaming Stick",
+          "Streaming Stick with Android TV"</li>
+        <li><span style="color:green">Correct</span>: "Streaming Stick with Android"</li>
+      </ul>
+      <p>If used with your logo, "for Android" or "with Android" should be no larger than 90% of
+        your logo’s size. First instance of this use should be followed by a TM symbol,
+        "for Android&trade;".</p>
+    </li>
     <li>Android may be used as a descriptor, as long as it is followed by a
         proper generic term. (Think of "Android" as a term used in place of
         "the Android platform.")