am 076f0bfb: Merge change 8313 into donut

Merge commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61'

* commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61':
  Fixed PDK links that point to the Creative Commons License
This commit is contained in:
Android (Google) Code Review
2009-07-23 16:25:46 -07:00
committed by Android Git Automerger

View File

@@ -59,7 +59,7 @@ def:custom_cc_copyright() ?>
Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
restrictions, see the <a href="http://developer.android.com/license.html">Content
License</a>.<?cs
/def ?>
@@ -67,7 +67,7 @@ def:custom_cc_copyright() ?>
def:custom_copyright() ?>
Except as noted, this content is licensed under <a
href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
For details and restrictions, see the <a href="http://developer.android.com/license.html">
Content License</a>.<?cs
/def ?>