commit 79a454b2299391abbd19b2186a8c1761060bd7e9
author ricow@google.com <ricow@google.com> Wed Jan 08 12:18:39 2014 +0000
committer ricow@google.com <ricow@google.com> Wed May 27 13:31:23 2015 -0700
tree 868b797c0ad20f824f7cb06d034c13f67ffae669
parent a21ddcc2ef5220714cd8435f569b739db41cb440

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