diff --git a/api/current.txt b/api/current.txt
index 2b5a29cb51c0a..44a93d28b3f4c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21399,7 +21399,6 @@ package android.os {
     field public static final int JELLY_BEAN_MR2 = 18; // 0x12
     field public static final int KITKAT = 19; // 0x13
     field public static final int KITKAT_WATCH = 20; // 0x14
-    field public static final int L = 21; // 0x15
     field public static final int LOLLIPOP = 21; // 0x15
     field public static final int LOLLIPOP_MR1 = 22; // 0x16
   }
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 121983ccad41f..72d61e8f70fa6 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -555,6 +555,7 @@ public class Build {
 
         /**
          * Temporary until we completely switch to {@link #LOLLIPOP}.
+         * @hide
          */
         public static final int L = 21;
 
@@ -567,6 +568,24 @@ public class Build {
          * <li> {@link android.content.Context#bindService Context.bindService} now
          * requires an explicit Intent, and will throw an exception if given an implicit
          * Intent.</li>
+         * <li> {@link android.app.Notification.Builder Notification.Builder} will
+         * not have the colors of their various notification elements adjusted to better
+         * match the new material design look.</li>
+         * <li> {@link android.os.Message} will validate that a message is not currently
+         * in use when it is recycled.</li>
+         * <li> Hardware accelerated drawing in windows will be enabled automatically
+         * in most places.</li>
+         * <li> {@link android.widget.Spinner} throws an exception if attaching an
+         * adapter with more than one item type.</li>
+         * <li> If the app is a launcher, the launcher will be available to the user
+         * even when they are using corporate profiles (which requires that the app
+         * use {@link android.content.pm.LauncherApps} to correctly populate its
+         * apps UI).</li>
+         * <li> Calling {@link android.app.Service#stopForeground Service.stopForeground}
+         * with removeNotification false will modify the still posted notification so that
+         * it is no longer forced to be ongoing.</li>
+         * <li> A {@link android.service.dreams.DreamService} must require the
+         * {@link android.Manifest.permission#BIND_DREAM_SERVICE} permission to be usable.</li>
          * </ul>
          */
         public static final int LOLLIPOP = 21;