diff --git a/api/current.txt b/api/current.txt
index 3edc1212b49ec..e1e148a70cee0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -313,7 +313,6 @@ package android {
field public static final int backgroundSplit = 16843659; // 0x101038b
field public static final int backgroundStacked = 16843658; // 0x101038a
field public static final int backupAgent = 16843391; // 0x101027f
- field public static final int banner = 16843762; // 0x10103f2
field public static final int baseline = 16843548; // 0x101031c
field public static final int baselineAlignBottom = 16843042; // 0x1010122
field public static final int baselineAligned = 16843046; // 0x1010126
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 4eb0b8d59b2d9..9b3f2bfb8a393 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -62,7 +62,7 @@
a reference to a Drawable resource containing the image definition. -->
-
@@ -1001,6 +1002,7 @@
+
@@ -1028,6 +1030,7 @@
+
@@ -1061,6 +1064,7 @@
+
@@ -1328,6 +1332,7 @@
+
@@ -1410,6 +1415,7 @@
+
@@ -1453,6 +1459,7 @@
+
@@ -1488,6 +1495,7 @@
+
@@ -1553,6 +1561,7 @@
+
@@ -1625,6 +1634,7 @@
parent="AndroidManifestActivity AndroidManifestReceiver AndroidManifestService">
+
@@ -1754,6 +1764,7 @@
+
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 67b43326190f3..a2493a7e9a8e0 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2092,7 +2092,6 @@
=============================================================== -->
-