diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
| commit | 05f803377ebcf2f9c6160fa125948598f0558113 (patch) | |
| tree | 137fd61b6419fa191a1940d53135db2dad7a7f07 /docs/html/index.jd | |
| parent | 855d5495ffbd9d0e2dfbd22def462247a1a4e61b (diff) | |
| parent | ab6d5376048b72f40d978751d884e74f7ee90d31 (diff) | |
| download | frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.zip frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.gz frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.bz2 | |
resolved conflicts for merge of ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
Diffstat (limited to 'docs/html/index.jd')
| -rw-r--r-- | docs/html/index.jd | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 71f6d58..c0a5b4b 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -1,5 +1,4 @@ fullpage=true -page.viewport_width=970 excludeFromSuggestions=true page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers. page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" /> @@ -31,13 +30,12 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 </div><!-- end .wrap --> </div><!-- end .actions-bar --> -<div class="dac-hero-carousel" data-carousel-query="collection:distribute/landing/carousel"> -</div> + <section class="dac-section dac-section-light" id="build-apps"><div class="wrap"> <h1 class="dac-section-title">Build Beautiful Apps</h1> <div class="dac-section-subtitle"> - See what’s new or find the resources to get you started with designing and developing for Android. + Resources to get you started with designing and developing for Android. </div> <div class="resource-widget resource-flow-layout col-16" data-query="collection:index/primary" @@ -45,11 +43,14 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 data-maxResults="3"></div> </div></section> +<div class="dac-hero-carousel" data-carousel-query="collection:distribute/landing/carousel"> +</div> + <section class="dac-section dac-gray"><div class="wrap"> <div class="cols"><div class="col-10of12 col-push-1of12"> <h1 class="dac-section-title">Build for a Multi-Screen World</h1> <div class="dac-section-subtitle"> - Android runs on hundreds of millions of handheld devices around the world, + Android runs on billions of handheld devices around the world, and it now supports these exciting, new form-factors. </div> </div></div> |