| d7b0b1b361c4cc745274a6e754b0ef2d57c73c4b |
|
25-Sep-2014 |
Primiano Tucci <primiano@google.com> |
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
/frameworks/webview/chromium/tools/merge_to_android.py
|