diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-12 10:56:18 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-12 09:58:48 +0000 |
| commit | 7eaa46dc95f9461cdb5f04c574c6b94a64fd4fbb (patch) | |
| tree | 0f39d7dc040b6ec16e17c48ac7749924dd5bfa43 /chromium/tools | |
| parent | 364e97a049927e74db4888d19c2f4cee17e91a27 (diff) | |
| download | android_frameworks_webview-7eaa46dc95f9461cdb5f04c574c6b94a64fd4fbb.tar.gz android_frameworks_webview-7eaa46dc95f9461cdb5f04c574c6b94a64fd4fbb.tar.bz2 android_frameworks_webview-7eaa46dc95f9461cdb5f04c574c6b94a64fd4fbb.zip | |
WebView Automerger - don't try to merge googleurl anymore.
the googleurl project is now part of the main chromium project
and not pulled via DEPS anymore. Remove it from the merge script.
Change-Id: I984e338f7e3c60eacb59baf810e7ce688b46ea21
(cherry picked from commit 1877218f76a9fd423566d653593083bc9ea8fd13)
Diffstat (limited to 'chromium/tools')
| -rw-r--r-- | chromium/tools/merge_common.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 23c8461..2f096aa 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -34,7 +34,6 @@ THIRD_PARTY_PROJECTS_WITH_FLAT_HISTORY = [ ] THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ - 'googleurl', 'sdch/open-vcdiff', 'testing/gtest', 'third_party/angle_dx11', |