am fefe7a22: Merge "Fix build." into kraken
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index d4a190f..7047113 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -174,7 +174,7 @@
* Value for {@link #flags}: true when the application's window can be
* increased in size for larger screens. Corresponds to
* {@link android.R.styleable#AndroidManifestSupportsScreens_largeScreens
- * android:smallScreens}.
+ * android:largeScreens}.
*/
public static final int FLAG_SUPPORTS_LARGE_SCREENS = 1<<11;
@@ -268,7 +268,7 @@
* Value for {@link #flags}: true when the application's window can be
* increased in size for extra large screens. Corresponds to
* {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens
- * android:smallScreens}.
+ * android:xlargeScreens}.
*/
public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19;
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 03152b1..fb50735 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1244,6 +1244,7 @@
=============================================================== -->
<public type="attr" name="logo" id="0x010102be" />
+ <public type="attr" name="xlargeScreens" id="0x010102bf" />
<public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />
<public-padding type="id" name="kraken_resource_pad" end="0x01020040" />