diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2012-08-01 13:49:11 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2012-08-02 09:21:30 -0700 |
| commit | 5baafabafd12c026bf4146f4244ca357609d44b9 (patch) | |
| tree | 70a6c93637a2d4e2ad41de92acdbe69fd522cb68 /docs/html/legal.jd | |
| parent | 4881d8d3f12efc9bdb3b4c71d117a2c53919d258 (diff) | |
| download | frameworks_base-5baafabafd12c026bf4146f4244ca357609d44b9.zip frameworks_base-5baafabafd12c026bf4146f4244ca357609d44b9.tar.gz frameworks_base-5baafabafd12c026bf4146f4244ca357609d44b9.tar.bz2 | |
Doc change: add trademarks attribution.
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
Diffstat (limited to 'docs/html/legal.jd')
| -rw-r--r-- | docs/html/legal.jd | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/html/legal.jd b/docs/html/legal.jd index 3c614d3..3206503 100644 --- a/docs/html/legal.jd +++ b/docs/html/legal.jd @@ -18,12 +18,11 @@ mobile.</p> <p>To start developing apps for Android, <a href="{@docRoot}sdk/index.html">download the free Android SDK</a>.</p> - - <h2 id="Brands">Android Brands</h2> -<p>The "Android" name and <img src="images/android-logo.png" alt="Android" -style="margin:0;padding:0 2px;vertical-align:baseline" /> logo are trademarks of Google Inc. +<p>The "Android" name, the <img src="images/android-logo.png" alt="Android" +style="margin:0;padding:0 2px;vertical-align:baseline" /> logo, and +<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google Inc. You may not use the logo or the logo's custom typeface.</p> <p>You may use the word "Android" in a product name only as a descriptor, such as "for Android" @@ -42,7 +41,7 @@ use of it must be attributed as such.</p> <p>For more information about Android brands, see the <a href="{@docRoot}distribute/googleplay/promote/brand.html">Android Branding Guidelines</a>.</p> - +<p>All other trademarks are the property of their respective owners.</p> <h2 id="WebSite">Web Site Content</h2> @@ -126,4 +125,6 @@ Terms of Service</a></p> href="http://developer.android.com">developer.android.com</a> are subject to their own terms, as documented on their respective web sites. </p> + + </div>
\ No newline at end of file |