From 9d97b63d0e0c7c9deb2d140c1dd579b51f52c1af Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Sun, 23 Jan 2011 14:56:39 -0800
Subject: [PATCH] Honeycomb is now officially API 11.

Change-Id: I5b11801468bf6ee2482f1ef201ece70ed9303bd8
---
 api/11.xml                      | 13 ++++++++++++-
 api/current.xml                 | 13 ++++++++++++-
 core/java/android/os/Build.java | 13 +++++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/api/11.xml b/api/11.xml
index bb690250b6acb..6ed9d225e336d 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -138515,11 +138515,22 @@
  visibility="public"
 >
 </field>
+<field name="GINGERBREAD_MR1"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="10"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="HONEYCOMB"
  type="int"
  transient="false"
  volatile="false"
- value="10000"
+ value="11"
  static="true"
  final="true"
  deprecated="not deprecated"
diff --git a/api/current.xml b/api/current.xml
index bb690250b6acb..6ed9d225e336d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -138515,11 +138515,22 @@
  visibility="public"
 >
 </field>
+<field name="GINGERBREAD_MR1"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="10"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="HONEYCOMB"
  type="int"
  transient="false"
  volatile="false"
- value="10000"
+ value="11"
  static="true"
  final="true"
  deprecated="not deprecated"
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 35f1c58db6e59..8d2607a435f0e 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -197,12 +197,17 @@ public class Build {
         public static final int FROYO = 8;
         
         /**
-         * Newest version of Android, version 2.3.
+         * November 2010: Android 2.3
          */
         public static final int GINGERBREAD = 9;
+        
+        /**
+         * Almost newest version of Android, version 2.3.3.
+         */
+        public static final int GINGERBREAD_MR1 = 10;
 
         /**
-         * Next next version of Android.
+         * Newest version of Android, version 3.0.
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
@@ -211,7 +216,7 @@ public class Build {
          *      {@link android.R.style#Theme_Holo}.
          * <li> The activity lifecycle has changed slightly as per
          * {@link android.app.Activity}.
-         * <li> When an application requires a permission to access on of
+         * <li> When an application requires a permission to access one of
          * its components (activity, receiver, service, provider), this
          * permission is no longer enforced when the application wants to
          * access its own component.  This means it can require a permission
@@ -219,7 +224,7 @@ public class Build {
          * component.
          * </ul>
          */
-        public static final int HONEYCOMB = CUR_DEVELOPMENT;
+        public static final int HONEYCOMB = 11;
     }
     
     /** The type of build, like "user" or "eng". */