summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-08-29 17:00:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-29 17:00:30 -0700
commitf404d10225a2df60eb118089f8f0e72ab5845d48 (patch)
tree30169fe372c8a599c76c0ff2bf5bb2c6c664c346 /core/java/android
parent5a05f2bf22954fdbd294bca8adc2b8ef0e8c5e00 (diff)
parent29d8d267dd97f66d829478778de5e0c56b965a47 (diff)
Merge "Fix build for some javac compilers." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/WindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 51503fd71861..f30952caf9a6 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -180,7 +180,7 @@ public interface WindowManager extends ViewManager {
@ViewDebug.IntToString(from = TYPE_HIDDEN_NAV_CONSUMER, to = "TYPE_HIDDEN_NAV_CONSUMER"),
@ViewDebug.IntToString(from = TYPE_DREAM, to = "TYPE_DREAM"),
@ViewDebug.IntToString(from = TYPE_NAVIGATION_BAR_PANEL, to = "TYPE_NAVIGATION_BAR_PANEL"),
- @ViewDebug.IntToString(from = TYPE_DISPLAY_OVERLAY, to = "TYPE_DISPLAY_OVERLAY"),
+ @ViewDebug.IntToString(from = TYPE_DISPLAY_OVERLAY, to = "TYPE_DISPLAY_OVERLAY")
})
public int type;