commit 3cd91ae56f2f35731d86d50d844c60734510fac8
author Primiano Tucci <primiano@google.com> Thu Sep 25 12:29:21 2014 +0100
committer Ben Murdoch <benm@google.com> Fri Oct 03 17:02:07 2014 +0000
tree 5ceb7aa43ff2e9e225ed769b0e0acded9fb52e8d
parent 040a02dbeefe9138549dde8c61a4a4ae424fbce5

Merge scripts: rename merge_to_master.py -> merge_to_android.py

- Add an extra check to merge_from_chromium.py to ascertain that the
  remote branch exists locally.
- Rename merge_to_master.py -> merge_to_android.py: the former name is
  confusing when we merge to M* branches. The new name is also more
  consistent with merge_from_chromium.py
- Warn if the GYP_DEFINES env var is set.

Change-Id: I180f9c27a106f31a7e472b14bfcacb2a7444d534
(cherry picked from commit d7b0b1b361c4cc745274a6e754b0ef2d57c73c4b)