From b77c162ab29152d6a4d81be3edd1f650602172f4 Mon Sep 17 00:00:00 2001
From: Richard Coles <torne@google.com>
Date: Thu, 4 Sep 2014 12:19:42 +0000
Subject: Revert "Add libjpeg_turbo to merge list."

License is not marked as Android compatible.

This reverts commit 7dcc1a97013a6700f794747157798737ff03a28e.

Change-Id: Iae457f85ed552e9ceb48bf33df25b6d3955ef6b8
---
 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 f8621e6..4e58404 100644
--- a/chromium/tools/merge_common.py
+++ b/chromium/tools/merge_common.py
@@ -45,7 +45,6 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [
     'third_party/leveldatabase/src',
     'third_party/libaddressinput/src',
     'third_party/libjingle/source/talk',
-    'third_party/libjpeg_turbo',
     'third_party/libphonenumber/src/phonenumbers',
     'third_party/libphonenumber/src/resources',
     'third_party/libsrtp',
-- 
cgit v1.2.3