Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
diff --git a/docs/html/about/index.jd b/docs/html/about/index.jd
index 215fc3c..22f504e 100644
--- a/docs/html/about/index.jd
+++ b/docs/html/about/index.jd
@@ -119,40 +119,4 @@
<p>Preinstalled on hundreds of millions of Android devices around the world,
Google Play can be a growth engine for your business.</p>
-<p><a class="landing-page-link" href="{@docRoot}about/start.html">GET STARTED</a></p>
-
-<div style="background: #F0F0F0;
- border-top: 1px solid #DDD;
- padding: 20px 0 24px 0;
- overflow: auto;
- clear:both;
- margin-bottom:-10px;
- margin-top:60px;"">
- <div style="padding:0 0 0 29px;">
- <h4>Developer Story: Robot Invader</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=
- "//g0.gstatic.com/android/market/com.robotinvader.knightmare/hi-256-0-9e08d83bc8d01649e167131d197ada1cd1783fb0">
- <div style="width:700px;">
- <p style="margin-top:26px;margin-bottom:12px;">Robot Invader chose
- Android as the launch platform for their first game,
- <a data-g-event="Developers Page" data-g-label="Case Study Link" href=
- "//play.google.com/store/apps/details?id=com.robotinvader.knightmare"><em>Wind-up
- Knight</em></a>.
- </p>
- <p>
- Hear from the developers themselves how Android helped them reach more
- than 100 devices with a single app binary, then iterate rapidly to ensure
- a great experience for users.
- </p>
- </div>
- <iframe style="float:left;
- margin-right:24px;
- margin-top:14px;" width="700" height="394" src=
- "http://www.youtube.com/embed/hTtlLiUTowY" frameborder="0" allowfullscreen></iframe>
- </div>
-</div>
\ No newline at end of file
+<p><a class="landing-page-link" href="{@docRoot}about/start.html">GET STARTED</a></p>
\ No newline at end of file