am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs

automerge: e90a170

* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
  Adds link to related video.
This commit is contained in:
David Friedman
2014-12-12 04:23:07 +00:00
committed by android-build-merger

View File

@@ -4,6 +4,7 @@ sdk.platform.version=5.0
sdk.platform.apiLevel=21 sdk.platform.apiLevel=21
@jd:body @jd:body
<!-- video box -->
<div id="qv-wrapper"> <div id="qv-wrapper">
<div id="qv"> <div id="qv">
@@ -23,6 +24,13 @@ sdk.platform.apiLevel=21
<li><a href="#managed_profiles">Support for Managed Profiles</a></li> <li><a href="#managed_profiles">Support for Managed Profiles</a></li>
</ol> </ol>
<a class="notice-developers-video" href="https://www.youtube.com/watch?v=Uiq2kZ2JHVY">
<div>
<h3>Video</h3>
<p>Notifications</p>
</div>
</a>
<h2>API Differences</h2> <h2>API Differences</h2>
<ol> <ol>
<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li> <li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li>