diff options
| author | Richard Coles <torne@google.com> | 2014-09-04 14:01:35 +0000 |
|---|---|---|
| committer | Richard Coles <torne@google.com> | 2014-09-04 14:01:35 +0000 |
| commit | 08405508c87986b13e10dcc33bee2ce3312f5b58 (patch) | |
| tree | c61f400582b4f5ad26f6a15bef44b75c75be8d1a | |
| parent | b77c162ab29152d6a4d81be3edd1f650602172f4 (diff) | |
| download | android_frameworks_webview-08405508c87986b13e10dcc33bee2ce3312f5b58.tar.gz android_frameworks_webview-08405508c87986b13e10dcc33bee2ce3312f5b58.tar.bz2 android_frameworks_webview-08405508c87986b13e10dcc33bee2ce3312f5b58.zip | |
Revert "Revert "Add libjpeg_turbo to merge list.""
This reverts commit b77c162ab29152d6a4d81be3edd1f650602172f4. License issue is now fixed.
Change-Id: I543e1fdb4709cd020673b74c4214147eecacba77
| -rw-r--r-- | chromium/tools/merge_common.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 4e58404..f8621e6 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -45,6 +45,7 @@ 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', |