tree b6eaf4f9cc7d9cc9aa04661beb2dfdb64673bac3
parent 5d6864f2d617bb5a0e143f0c8d7f7caa58bfe5cd
author Primiano Tucci <primiano@google.com> 1408998384 +0100
committer Primiano Tucci <primiano@google.com> 1410356808 +0000

Update merge_from_chromium.py after Chromium Git migration.

Chromium has switched to Git. SVN is not the source of truth anymore.
The following change removes --svn support from merge_from_chromium.py
and makes it understand git.
Also, this is removing the --lkgr option, as LKGR is being deprecated
in chromium.

Change-Id: I879e9cda2cee313f1e2409a1a85b173db59efd8c
(cherry picked from commit 753233e1666d4a8f69a4fae4345f9590f19589ef)