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

<p>Android developers, their apps, and their successes with Android and Google Play. </p>

<div style="background: #F0F0F0;

            border-top: 1px solid #DDD;

            padding: 0px 0 24px 0;

            overflow: auto;

            clear:both;

            margin-bottom:40px;

            margin-top:30px;">

   <div style="padding:0 0 0 29px;">

        <h4>Developer Story: Colopl</h4>

          <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px;

            -moz-border-radius: 5px;

            border-radius: 5px height:78px;

            width: 78px;

            float: left;

            margin: 17px 20px 9px 0;" 

            src="//lh3.ggpht.com/sx2ILNaXQYOsHfR91T5tUWGlfXE1FutHCBN02Fll6mi9gIaG6RZCGbeJMtIvOoegCPTh=w124" >

          <div style="width:700px;">

          <p style="margin-top:26px;

                    margin-bottom:12px;">

          The creators of Kuma The Bear, Japan-based <a href="https://play.google.com/store/apps/developer?id=COLOPL,+Inc." target="_android">Colopl</a>, 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>

           </div>

           <iframe style="float:left;

             margin-right:24px;

             margin-top:14px;" width="700" height="394" src=

             "http://www.youtube.com/embed/CbpoZeQCNe4?HD=1;rel=0;origin=developer.android.com;" frameborder="0" allowfullscreen>

           </iframe>

   </div> 

</div>

<div style="background: #F0F0F0;

            border-top: 1px solid #DDD;

            padding: 0px 0 24px 0;

                <li class="item carousel-home">

                    <div class="content-left col-11" style="padding-top:65px;">

                      <script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>

                      <div style="box-shadow: 3px 10px 18px 1px #999;width:600px;height:338px">

                      <div style="box-shadow: 3px 10px 18px 1px #999;width:600px;height:336px">

                        <div id="ytapiplayer">

                          You need Flash player 8+ and JavaScript enabled to view this video.

                          <a href="http://www.youtube.com/watch?v=CbpoZeQCNe4"><img width=600 src="{@docRoot}images/video-Colopl.png"></a><!--You need Flash player 8+ and JavaScript enabled to view this video. -->

                        </div>

                        <script type="text/javascript">

                            var params = { allowScriptAccess: "always" };

                            var atts = { id: "ytapiplayer" };

                            swfobject.embedSWF("//www.youtube.com/v/O8i4HUw7JYA?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1",

                              "ytapiplayer", "600", "338", "8", null, null, params, atts);

                            swfobject.embedSWF("//www.youtube.com/v/CbpoZeQCNe4?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1",

                              "ytapiplayer", "600", "336", "8", null, null, params, atts);

                            // Callback used to pause/resume carousel based on video state

                            function onytplayerStateChange(newState) {              

                    <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">