Merge commit '3359ffe4' into jb-mr2-dev

This commit is contained in:
Chad Jones 2013-04-19 20:24:07 -07:00
commit b6c2e6b60c
2 changed files with 3 additions and 18 deletions

View file

@ -354,9 +354,9 @@ def:custom_copyright() ?>
<?cs <?cs
def:custom_footerlinks() ?> def:custom_footerlinks() ?>
<p> <p>
<a href="<?cs var:toroot ?>about/index.html">About Android</a>&nbsp;&nbsp;|&nbsp; <a href="<?cs var:toroot ?>source/index.html">About Android</a>&nbsp;&nbsp;|&nbsp;
<a href="<?cs var:toroot ?>source/community/index.html">Community</a>&nbsp;&nbsp;|&nbsp;
<a href="<?cs var:toroot ?>legal.html">Legal</a>&nbsp;&nbsp;|&nbsp; <a href="<?cs var:toroot ?>legal.html">Legal</a>&nbsp;&nbsp;|&nbsp;
<a href="<?cs var:toroot ?>support.html">Support</a>
</p><?cs </p><?cs
/def ?> /def ?>

View file

@ -1,22 +1,7 @@
<?cs if:!sac ?>
<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>> <div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>>
<?cs if:reference ?>
<div id="copyright">
<?cs call:custom_copyright() ?>
</div>
<div id="build_info">
<?cs call:custom_buildinfo() ?>
</div>
<?cs elif:!hide_license_footer ?>
<div id="copyright"> <div id="copyright">
<?cs call:custom_cc_copyright() ?> <?cs call:custom_cc_copyright() ?>
</div> </div>
<?cs /if ?> <div id="footerlinks">
<?cs if:!no_footer_links ?>
<div id="footerlinks">
<?cs call:custom_footerlinks() ?> <?cs call:custom_footerlinks() ?>
</div> </div>
<?cs /if ?>
</div> <!-- end footer -->
<?cs /if ?>