Fix regression introduced by the revert r186967 which reverted r186598.
Fix regression introduced by the revert r186967 which reverted r186598.

Keep the --with_branch_heads for compatibility but do not use it.

TBR=mmoss@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/12698003

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@186969 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

svn2github/chromium-depot-tools,svn2github/chromium-depot-tools,svn2github/chromium-depot-tools