summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/Build.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-09-05 10:13:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-05 10:13:34 -0700
commit672fcd5c9a90ed4e133d441fee3b0130c7acd769 (patch)
tree07c0f7202e24954b54200394118f0d65f0aab249 /core/java/android/os/Build.java
parent97f3c7d8a58309791c7670e8c137143a0114163b (diff)
parent04f31501602a87ae9526983f4a92e623b4d68bb3 (diff)
downloadframeworks_base-672fcd5c9a90ed4e133d441fee3b0130c7acd769.zip
frameworks_base-672fcd5c9a90ed4e133d441fee3b0130c7acd769.tar.gz
frameworks_base-672fcd5c9a90ed4e133d441fee3b0130c7acd769.tar.bz2
am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
* commit '04f31501602a87ae9526983f4a92e623b4d68bb3': Change build version from KEY_LIME_PIE to KITKAT
Diffstat (limited to 'core/java/android/os/Build.java')
-rw-r--r--core/java/android/os/Build.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index dd40e35..88eb280 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -438,7 +438,7 @@ public class Build {
public static final int JELLY_BEAN_MR2 = 18;
/**
- * Android X.X: Key Lime Pie, another tasty treat.
+ * Android X.X: KitKat, another tasty treat.
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
@@ -448,7 +448,7 @@ public class Build {
* {@link android.content.Context#bindService}.
* </ul>
*/
- public static final int KEY_LIME_PIE = CUR_DEVELOPMENT;
+ public static final int KITKAT = CUR_DEVELOPMENT;
}
/** The type of build, like "user" or "eng". */