Version 1.1.0-dev.5.4
Manually merged status file parts of revision 31486.
Manually patched dart/editor/tools/plugins/com.google.dart.tools.debug.core_test/src/com/google/dart/tools/debug/core/dartium/BreakpointManagerTest.java
The test file had a wrong merge conflict resolution
R=kasperl@google.com
Review URL: https://codereview.chromium.org//128093002
git-svn-id: http://dart.googlecode.com/svn/trunk@31603 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/pkg/pkg.status b/pkg/pkg.status
index 36160f6..de2031a 100644
--- a/pkg/pkg.status
+++ b/pkg/pkg.status
@@ -17,6 +17,7 @@
scheduled_test/test/scheduled_server_test: Pass, Fail # 13524
scheduled_test/test/scheduled_process_test: Pass, Slow # Issue 9231
+polymer/test/event_path_test: Pass, Fail # Issue 15766
# Skip test not runnable via test.dart
third_party/html5lib/test/dom_compat_test: Skip
diff --git a/tests/html/html.status b/tests/html/html.status
index b7fa8d6..3820d3d 100644
--- a/tests/html/html.status
+++ b/tests/html/html.status
@@ -21,6 +21,9 @@
[ $compiler == dart2js && $browser ]
custom/created_callback_test: Fail # Support for created constructor.
+[ $compiler == none && ($runtime == drt || $runtime == dartium) ]
+audiobuffersourcenode_test/functional: Fail # 15913
+
[ $compiler == none && ($runtime == drt || $runtime == dartium) && $mode == debug && $system == macos]
audiobuffersourcenode_test: Pass, Fail, Crash # http://crbug.com/256601
diff --git a/tools/VERSION b/tools/VERSION
index 53f77db..5d7d2ce 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 1
PATCH 0
PRERELEASE 5
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4
