commit 39cf8c97c3aee897cca7f37d3f7e9e36c3639f2d
author Dianne Hackborn <hackbod@google.com> Thu May 12 18:25:57 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Thu May 12 18:37:33 2011 -0700
tree e73384673e58850f7cfa3c27fb1a2d772464fb01
parent c6c8ada1632b9ea0ff87c1caa1141f93ec2256b2
parent ec85619f02715a6b4b8c077257b52f04aa1b1dba

resolved conflicts for merge of ec85619f to master

Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 83cbd7a..220b75b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13354,6 +13354,7 @@
     field public static final int GINGERBREAD_MR1 = 10; // 0xa
     field public static final int HONEYCOMB = 11; // 0xb
     field public static final int HONEYCOMB_MR1 = 12; // 0xc
+    field public static final int HONEYCOMB_MR2 = 10000; // 0x2710
     field public static final int ICE_CREAM_SANDWICH = 10000; // 0x2710
   }