summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-26 17:09:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-26 17:09:39 -0700
commit8fcbfb52607263754b6d3895a112f792c5c3a12e (patch)
tree476aee5f274bb2b028c0e9f12fa4d9192fde3f77 /core/java/android/app
parenta33bb164b2ac792d5bba76ba198fb052197fd520 (diff)
parent94250ac69c6e07534e4781d3479dccb79d8c366c (diff)
downloadframeworks_base-8fcbfb52607263754b6d3895a112f792c5c3a12e.zip
frameworks_base-8fcbfb52607263754b6d3895a112f792c5c3a12e.tar.gz
frameworks_base-8fcbfb52607263754b6d3895a112f792c5c3a12e.tar.bz2
am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '94250ac69c6e07534e4781d3479dccb79d8c366c': Add new supports-screens attributes for declaring the compatible screens.
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/ActivityThread.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 6c8f85f..d30010a 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1525,7 +1525,7 @@ public final class ActivityThread {
synchronized (this) {
ContextImpl context = getSystemContext();
context.init(new LoadedApk(this, "android", context, info,
- new CompatibilityInfo(info, 0, false)), null, this);
+ new CompatibilityInfo(info, 0, 0, false)), null, this);
}
}