diff options
| author | Robert Ly <robertly@google.com> | 2014-06-15 18:14:06 -0700 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2014-06-15 18:40:06 -0700 |
| commit | 1568c19fe3a629b9ce918c59a5ab31dcce2a2553 (patch) | |
| tree | 543c3c5f5cd45c520be9f371b4a74b10324991f8 /docs/html/wear | |
| parent | d6beebffe440fd5579db994023236095331a8bb8 (diff) | |
| download | frameworks_base-1568c19fe3a629b9ce918c59a5ab31dcce2a2553.zip frameworks_base-1568c19fe3a629b9ce918c59a5ab31dcce2a2553.tar.gz frameworks_base-1568c19fe3a629b9ce918c59a5ab31dcce2a2553.tar.bz2 | |
docs: fix index pages
Change-Id: I2a011ee5a3539d908d10ac5dbc9c0df3e7633220
Diffstat (limited to 'docs/html/wear')
| -rw-r--r-- | docs/html/wear/images/hero.jpg | bin | 117586 -> 248879 bytes | |||
| -rw-r--r-- | docs/html/wear/index.jd | 4 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/html/wear/images/hero.jpg b/docs/html/wear/images/hero.jpg Binary files differindex 565ffb8..7850a81 100644 --- a/docs/html/wear/images/hero.jpg +++ b/docs/html/wear/images/hero.jpg diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd index 4c56cf2..026698c 100644 --- a/docs/html/wear/index.jd +++ b/docs/html/wear/index.jd @@ -182,11 +182,9 @@ page.type=about </div> </div> <!-- end .wrap --> </div> <!-- end .landing-section --> -<<<<<<< HEAD + <!-- -======= ->>>>>>> add page.types to various pages for dynamic content <div class="landing-section landing-white-background"> <div class="wrap"> <div class="landing-section-header"> |
