Fix merge commit bug.
Fix merge commit bug.

BUG=
R=alanknight@google.com

Review URL: https://codereview.chromium.org//27037003

git-svn-id: a962b240025cf0577aa172e20f49ccb159ba6be1@28530 260f80e4-7a28-3924-810f-c04153c831b5

cjkao/dart-pub,computmaxer/pub,dart-lang/pub,dart-lang/pub,maxwellpeterson-wf/pub