resolved conflics for merge of 54201120 to jb-mr2-dev

Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa

diff --cc docs/html/index.jd
index a972309,d12b981..73fc302
--- 1/docs/html/index.jd
--- 2/docs/html/index.jd
+++ b/docs/html/index.jd
@@@ -93,10 -60,41 +93,41 @@@ page.metaDescription=The official site 
                        </div>
                      </div>
                      <div class="content-right col-4">
 -                    <h1 style="white-space:nowrap;line-height:1.2em;">Developer Story: <br />Colopl</h1>
 -                    <p>The creators of Kuma The Bear, Japan-based Colopl, talk about how Google Play and Android allowed them to grow their business to become one of the most profitable games publishers in APAC to date. </p>
 +                    <h1 style="white-space:nowrap;line-height:1.2em;">Developer Story: <br />redBus.in</h1>
 +                    <p>Bangalore-based developers redBus.in talk about how Android is helping them deliver a superior booking and travel experience to millions of daily bus riders in India.</p>
                      </div>
                  </li>
+ 
+                 <li class="item carousel-home">
+                     <div class="content-left col-11" style="padding-top:10px;">
+                         <a href="{@docRoot}channels/io2013.html">
+                           <img src="{@docRoot}images/home/io-videos-2013.png" style="margin:60px 0 0;
+                           box-shadow: 3px 10px 18px 1px #999;">
+                         </a>
+                     </div>
+                     <div class="content-right col-4">
+                     <h1>Watch the Android talks from Google I/O</h1>
+                     <p>If you weren't able to attend Google I/O in person or couldn't make it
+                     to all the talks, you can catch up on the action
+                     with all the recordings, brought to you by
+                     <a href="http://developers.google.com/live">Google Developers Live</a>.</p>
+                     <p><a href="{@docRoot}channels/io2013.html" class="button"
+                     >See the Android talks</a></p>
+                     </div>
+                 </li>
+ 
+ 
+                 <li class="item carousel-home">
+                     <div class="content-left col-9">
+                         <a href="{@docRoot}about/versions/jelly-bean.html"><img src="{@docRoot}images/home/android-jellybean.png" ></a>
+                     </div>
+                     <div class="content-right col-6">
+                     <h1>Android 4.2 Jelly Bean!</h1>
+                     <p>The latest version of Jelly Bean is here, with performance optimizations, a refreshed UI, and great new features for developers. </p>
+                     <p>Android 4.2 includes APIs for developing lock sceen widgets and Daydream screensavers, using external displays, creating RTL layouts, building flexible UI with nested Fragments, and much more.</p>
+                     <p><a href="{@docRoot}about/versions/jelly-bean.html" class="button">Learn More</a></p>
+                     </div>
+                 </li>
                  <li class="item carousel-home">
                      <div class="content-left col-10">
                          <img src="{@docRoot}images/home/design.png" style="margin-top:30px">