Correct merge errors in co19 roll

Correct merge errors in co19 roll

This corrects merge errors found in the commit of
https://codereview.chromium.org/2954443002/

BUG=
R=kustermann@google.com

Committed: https://github.com/dart-lang/sdk/commit/3078734ff78920ee786f5313d8989f01dc7e487a

[Bill Hesse, 2017-06-22 11:30:36]

whesse@google.com changed reviewers:
+ kustermann@google.com

[Bill Hesse, 2017-06-22 11:30:37]

I think this should cover failures caused by the last commit.  We can check to
make sure all the lines here seem needed.

[kustermann, 2017-06-22 11:38:58]

lgtm

https://codereview.chromium.org/2948153004/diff/1/tests/co19/co19-dart2js.status
File tests/co19/co19-dart2js.status (right):

https://codereview.chromium.org/2948153004/diff/1/tests/co19/co19-dart2js.sta...
tests/co19/co19-dart2js.status:4074:
Language/Statements/Yield_and_Yield_Each/Yield/execution_async_t04:
Pass,RuntimeError # Issue 26615
Pass, Fail is really bad generally speaking! Such a basic language feature test
should work!

https://codereview.chromium.org/2948153004/diff/1/tests/co19/co19-runtime.status
File tests/co19/co19-runtime.status (right):

https://codereview.chromium.org/2948153004/diff/1/tests/co19/co19-runtime.sta...
tests/co19/co19-runtime.status:19:
LibTest/collection/DoubleLinkedQueue/DoubleLinkedQueue_class_A01_t01:
Pass,Timeout # Please triage this failure
Use this one instead: 

https://codereview.chromium.org/2944383005

[Bill Hesse, 2017-06-22 11:47:09]

https://codereview.chromium.org/2948153004/diff/1/tests/co19/co19-dart2js.status
File tests/co19/co19-dart2js.status (right):

https://codereview.chromium.org/2948153004/diff/1/tests/co19/co19-dart2js.sta...
tests/co19/co19-dart2js.status:4074:
Language/Statements/Yield_and_Yield_Each/Yield/execution_async_t04:
Pass,RuntimeError # Issue 26615
On 2017/06/22 11:38:57, kustermann wrote:
> Pass, Fail is really bad generally speaking! Such a basic language feature
test
> should work!

Yes.  They seem to be passing now.  Removing these lines.

[Bill Hesse, 2017-06-22 11:47:48]

Description was changed from

==========
Correct merge errors in co19 roll

This corrects merge errors found in the commit of
https://codereview.chromium.org/2954443002/

BUG=
==========

to

==========
Correct merge errors in co19 roll

This corrects merge errors found in the commit of
https://codereview.chromium.org/2954443002/

BUG=
R=kustermann@google.com

Committed:
https://github.com/dart-lang/sdk/commit/3078734ff78920ee786f5313d8989f01dc7e487a
==========

[Bill Hesse, 2017-06-22 11:47:49]

Committed patchset #2 (id:20001) manually as
3078734ff78920ee786f5313d8989f01dc7e487a.