Fix branch name in merge script.
authormachenbach <machenbach@chromium.org>
Mon, 16 Feb 2015 11:57:29 +0000 (03:57 -0800)
committerCommit bot <commit-bot@chromium.org>
Mon, 16 Feb 2015 11:57:41 +0000 (11:57 +0000)
commitbbb639adb7b973c9878d4e0e5cb92b3ad5366950
treebb50daa0dc4b10662604dd1b60890cd2a4aaea1f
parent6834d3abdf9c463e4c03847077b56bd688c2d753
Fix branch name in merge script.

BUG=chromium:451975
TBR=tandrii@chromium.org
NOTRY=true
LOG=n

TEST=./script_test.py

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

Cr-Commit-Position: refs/heads/master@{#26657}
tools/release/common_includes.py
tools/release/test_scripts.py