diff options
| author | Selim Gurun <sgurun@google.com> | 2013-07-29 17:04:08 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2013-07-29 17:04:08 -0700 |
| commit | 9f110615014e3a578fab6b60c2f24e16e5a8866a (patch) | |
| tree | e3142de74518682a2743b3befc7914c3545cdd12 /chromium/tools | |
| parent | 2d3cf4af11b27d517757345562014ed8eda602ba (diff) | |
| download | android_frameworks_webview-9f110615014e3a578fab6b60c2f24e16e5a8866a.tar.gz android_frameworks_webview-9f110615014e3a578fab6b60c2f24e16e5a8866a.tar.bz2 android_frameworks_webview-9f110615014e3a578fab6b60c2f24e16e5a8866a.zip | |
Fix Automerger
Fixing automerger problem that was created due to
https://codereview.chromium.org/21020006
Change-Id: Iea40d2420ae5576d75569fb02a928bb44494845c
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 52f4ee8..46ece78 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -42,7 +42,6 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'third_party/freetype', 'third_party/icu', 'third_party/leveldatabase/src', - 'third_party/libjingle/source', 'third_party/libphonenumber/src/phonenumbers', 'third_party/libphonenumber/src/resources', 'third_party/mesa/src', |