aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org>2014-09-04 12:56:33 +0000
committertorne@chromium.org <torne@chromium.org>2014-09-04 12:56:33 +0000
commit3963fbcd6c16965948a9c081c6e9dce82a938dad (patch)
tree61bb28da4d15b0706d51df8acf1a908df7d70fe3
parent2ed5319ce40b0ba2cd9b962713ea0ef775781e69 (diff)
downloadlibjpeg_turbo-3963fbcd6c16965948a9c081c6e9dce82a938dad.tar.gz
Mark libjpeg-turbo's license as OK for android.
The custom BSD style license is compatible with Android's license requirements; mark it as such so that it can be merged to Android. BUG= R=dannyb@google.com Review URL: https://codereview.chromium.org/539063002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@291801 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r--README.chromium1
1 files changed, 1 insertions, 0 deletions
diff --git a/README.chromium b/README.chromium
index 0982c6b..a4431d8 100644
--- a/README.chromium
+++ b/README.chromium
@@ -4,6 +4,7 @@ Version: 1.3.1
License: Custom license
License File: LICENSE.txt
Security Critical: yes
+License Android Compatible: yes
Description:
This consists of the components: