Merge "New API level 17 for JB MR1." into jb-mr1-dev (d913cf18) · Commits · e / os / android_frameworks_base

api/17.txt

0 → 100644

+48037 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -15542,6 +15542,7 @@ package android.os {
		field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
		field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf
		field public static final int JELLY_BEAN = 16; // 0x10
		field public static final int JELLY_BEAN_MR1 = 17; // 0x11
		}

		public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

+6 −1

Original line number	Diff line number	Diff line
		@@ -370,7 +370,7 @@ public class Build {
		public static final int ICE_CREAM_SANDWICH_MR1 = 15;

		/**
		* Android 4.1.
		* June 2012: Android 4.1.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		@@ -411,6 +411,11 @@ public class Build {
		* </ul>
		*/
		public static final int JELLY_BEAN = 16;

		/**
		* Moar jelly beans!
		*/
		public static final int JELLY_BEAN_MR1 = 17;
		}

		/** The type of build, like "user" or "eng". */