commit 1ab615b3e6a7ae820fde4ba067f76dff635f3639
author David Friedman <dmail@google.com> Thu Dec 11 21:55:23 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 11 21:55:25 2014 +0000
tree af8498c87cbccf1dc55d7870d21128ea74dba5e0
parent 0aa234457737cdb31538711251920aef3a70bb56
parent 65a01238fc68b70a111d57001cbc8b7c022ece88

Merge "Adds link to related video." into lmp-docs

docs/html/about/versions/android-5.0-changes.jd

diff --git a/docs/html/about/versions/android-5.0-changes.jd b/docs/html/about/versions/android-5.0-changes.jd
index f54cde4..3de5c3c 100644
--- a/docs/html/about/versions/android-5.0-changes.jd
+++ b/docs/html/about/versions/android-5.0-changes.jd
@@ -4,6 +4,7 @@
 sdk.platform.apiLevel=21
 @jd:body
 
+<!-- video box -->
 
 <div id="qv-wrapper">
 <div id="qv">
@@ -23,6 +24,13 @@
   <li><a href="#managed_profiles">Support for Managed Profiles</a></li>
 </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>
 <ol>
 <li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li>
@@ -296,8 +304,8 @@
 
 <p>
   Android 5.0 includes a behavior change to ensure
-  that only one app can define a given custom permission, unless signed with the 
-  same key as other apps defining the permission. 
+  that only one app can define a given custom permission, unless signed with the
+  same key as other apps defining the permission.
 </p>
 
 <h3>
@@ -316,7 +324,7 @@
 <p>
   In Android 4.4 and earlier, users were able to install multiple such
   apps on a given device, although the system assigned the protection level
-  specified by the first-installed app. 
+  specified by the first-installed app.
 </p>
 
 <p>