From 9f110615014e3a578fab6b60c2f24e16e5a8866a Mon Sep 17 00:00:00 2001 From: Selim Gurun Date: Mon, 29 Jul 2013 17:04:08 -0700 Subject: Fix Automerger Fixing automerger problem that was created due to https://codereview.chromium.org/21020006 Change-Id: Iea40d2420ae5576d75569fb02a928bb44494845c --- chromium/tools/merge_common.py | 1 - 1 file changed, 1 deletion(-) (limited to 'chromium/tools') 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', -- cgit v1.2.3