diff options
| author | Richard Coles <torne@google.com> | 2014-09-04 12:19:42 +0000 |
|---|---|---|
| committer | Richard Coles <torne@google.com> | 2014-09-04 12:19:42 +0000 |
| commit | b77c162ab29152d6a4d81be3edd1f650602172f4 (patch) | |
| tree | 9ad6cbb93dbcf324c612fc4f553f383b16c36148 /chromium/tools | |
| parent | 7dcc1a97013a6700f794747157798737ff03a28e (diff) | |
| download | android_frameworks_webview-b77c162ab29152d6a4d81be3edd1f650602172f4.tar.gz android_frameworks_webview-b77c162ab29152d6a4d81be3edd1f650602172f4.tar.bz2 android_frameworks_webview-b77c162ab29152d6a4d81be3edd1f650602172f4.zip | |
Revert "Add libjpeg_turbo to merge list."
License is not marked as Android compatible.
This reverts commit 7dcc1a97013a6700f794747157798737ff03a28e.
Change-Id: Iae457f85ed552e9ceb48bf33df25b6d3955ef6b8
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 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', |