diff options
| author | 2016-05-26 01:03:06 +0000 | |
|---|---|---|
| committer | 2016-05-26 01:03:08 +0000 | |
| commit | bc983c443139c7b4605f98d56bd9ad7652a9938b (patch) | |
| tree | 91b2dc020ad0d53b5d2c8ecb41c828717c56fd6a | |
| parent | 7cb7a0aa60f0f01fbcb5b5023f642c527f3f1985 (diff) | |
| parent | 43ec62af45bb286dcc1e79afba7475aafb5ceb84 (diff) | |
Merge "N is API 24" into nyc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 39ca826a0fd8..f9e1d581006b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28268,7 +28268,7 @@ package android.os { field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP_MR1 = 22; // 0x16 field public static final int M = 23; // 0x17 - field public static final int N = 10000; // 0x2710 + field public static final int N = 24; // 0x18 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/api/system-current.txt b/api/system-current.txt index fd1dd3651b06..24ed72097ba4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30707,7 +30707,7 @@ package android.os { field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP_MR1 = 22; // 0x16 field public static final int M = 23; // 0x17 - field public static final int N = 10000; // 0x2710 + field public static final int N = 24; // 0x18 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/api/test-current.txt b/api/test-current.txt index 24ff66ba4237..b6ebf8a0be8c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -28337,7 +28337,7 @@ package android.os { field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP_MR1 = 22; // 0x16 field public static final int M = 23; // 0x17 - field public static final int N = 10000; // 0x2710 + field public static final int N = 24; // 0x18 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 7e1fc1539d72..dc7be6b5ad61 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -671,7 +671,7 @@ public class Build { /** * N is for ¯\_(ツ)_/¯. */ - public static final int N = CUR_DEVELOPMENT; + public static final int N = 24; } /** The type of build, like "user" or "eng". */ |