p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit 'e866294e' into lmp-mr1-dev-plus-aosp 

Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
This commit is contained in:
Qiwen Zhao 2014-09-18 12:21:48 -07:00
parent d76f466f89 e866294eec
commit d542afcb93
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/droiddoc/templates-sac/assets/images/sac_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
tools/droiddoc/templates-sac/assets/images/sac_logo@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

4
tools/droiddoc/templates-sac/components/masthead.cs
View File

@ -253,7 +253,9 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
<div class="wrap" id="header-wrap"> <div class="wrap" id="header-wrap">
<div class="col-3 saclogo"> <div class="col-3 saclogo">
<a href="<?cs var:toroot ?>index.html"> <a href="<?cs var:toroot ?>index.html">
<img src="<?cs var:toroot ?>assets/images/sac_logo.png" width="114" height="16" alt="Android Developers" /> <img src="<?cs var:toroot ?>assets/images/sac_logo.png"
srcset="<?cs var:toroot ?>assets/images/sac_logo@2x.png 2x"
width="123" height="25" alt="Android Developers" />
</a> </a>
</div> </div>
<ul class="nav-x col-9"> <ul class="nav-x col-9">