summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2016-06-06 19:14:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-06 19:14:13 +0000
commit79eea04d911eff54c6ac337474c0d31aeaba0a3a (patch)
tree698bc8f91cad174db3931361371e02e000043cad
parent6b0a1e98354f4126e3c19c6e6471e49bbafee819 (diff)
parent9e6c5a8493c16c44214a1816d7df3486bee5e45b (diff)
downloadSafetyRegulatoryInfo-79eea04d911eff54c6ac337474c0d31aeaba0a3a.tar.gz
Add additional legal notices. am: fb394e018d
am: 9e6c5a8493 * commit '9e6c5a8493c16c44214a1816d7df3486bee5e45b': Add additional legal notices. Change-Id: Ic7342dfa25d37b33ef8ee3ef7accbebc79bceecf
-rw-r--r--NOTICE19
1 files changed, 19 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
index 0a7877a..338f06a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -188,3 +188,22 @@
END OF TERMS AND CONDITIONS
+
+THIS PRODUCT IS LICENSED UNDER THE MPEG-4 VISUAL PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND
+NON-COMMERCIAL USE OF A CONSUMER FOR (i) ENCODING VIDEO IN COMPLIANCE WITH THE MPEG-4 VISUAL
+STANDARD ("MPEG-4 VIDEO") AND/OR (ii) DECODING MPEG-4 VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED
+IN A PERSONAL AND NONCOMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED BY MPEG
+LA TO PROVIDE MPEG-4 VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL
+INFORMATION INCLUDING THAT RELATING TO PROMOTIONAL, INTERNAL AND COMMERCIAL USES AND LICENSING MAY
+BE OBTAINED FROM MPEG LA, LLC. SEE HTTP://WWW.MPEGLA.COM.
+
+THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND NONCOMMERCIAL
+USE OF A CONSUMER TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD ("AVC VIDEO") AND/OR (ii)
+DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND NON-COMMERCIAL ACTIVITY
+AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR
+SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C.
+SEE HTTP://WWW.MPEGLA.COM
+
+"MPEG Layer-3 audio coding technology licensed from Fraunhofer IIS and Thomson."
+
+"mp3 Surround audio coding technology licensed from Fraunhofer lIS, Agere Systems and Thomson." \ No newline at end of file