commit edfc6af590fa860403779d20a469d198f742ab67
author Dianne Hackborn <hackbod@google.com> Thu Sep 04 23:08:23 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 23:08:24 2014 +0000
tree 9b97cc6120c23119bb9ecc7a589a95e666ed4683
parent 649db7f0a5b1a2add3f68ace9d7896a76340ff78
parent 521e4bd7c5252455c01a0fe253e0357ff0733b8e

Merge "Fix issue #17375172...   sshhhhhh!!!" into lmp-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f479430..a31dca5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21563,7 +21563,7 @@
     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 = 10000; // 0x2710
+    field public static final int L = 21; // 0x15
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index b0e0b49..1e0dc53 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -541,7 +541,7 @@
          * Intent.</li>
          * </ul>
          */
-        public static final int L = CUR_DEVELOPMENT;
+        public static final int L = 21;
     }
     
     /** The type of build, like "user" or "eng". */