diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2012-08-02 15:39:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 15:39:55 -0700 |
| commit | 6677951135f6062c678f98af2f8fb42f8241ae9b (patch) | |
| tree | b81b3508f97f238f89be23432611022f316dd831 /docs | |
| parent | f95f3ebf12bf9ee23b8ed4e940ab007cbc22f3f3 (diff) | |
| parent | 265eea82ae24b5620dc84fa6c51ba72aca9a1cf6 (diff) | |
| download | frameworks_base-6677951135f6062c678f98af2f8fb42f8241ae9b.zip frameworks_base-6677951135f6062c678f98af2f8fb42f8241ae9b.tar.gz frameworks_base-6677951135f6062c678f98af2f8fb42f8241ae9b.tar.bz2 | |
am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '265eea82ae24b5620dc84fa6c51ba72aca9a1cf6':
Doc change: add trademarks attribution.
Diffstat (limited to 'docs')
| -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 |