diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-05-14 14:47:28 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2014-05-14 14:50:13 -0700 |
| commit | 9a6672beb1c53559180596ce6b49f9da0c8a0ed7 (patch) | |
| tree | b4693ae211a34491a7e98247ff9c115ae7933110 /docs/html/legal.jd | |
| parent | f8c940733ed0aaa95a66cb80181f08e39e4592fa (diff) | |
| parent | 93ccd1a2eb16cf4fdd678e3d5b61f73d1bd0de88 (diff) | |
| download | frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.zip frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.tar.gz frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.tar.bz2 | |
resolved conflices for merge of 93ccd1a2 to master
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
Diffstat (limited to 'docs/html/legal.jd')
| -rw-r--r-- | docs/html/legal.jd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/html/legal.jd b/docs/html/legal.jd index aaa3c39..c6143da 100644 --- a/docs/html/legal.jd +++ b/docs/html/legal.jd @@ -1,4 +1,5 @@ page.title=Legal Notice +page.type=about fullpage=1 @jd:body @@ -39,7 +40,7 @@ href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution< 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">Brand Guidelines</a>.</p> +href="{@docRoot}distribute/tools/promote/brand.html">Brand Guidelines</a>.</p> <p>All other trademarks are the property of their respective owners.</p> |