ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Fix merge conflict for 'c506ab89'

Browse Source 
Conflicts:
	NOTICE

Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
This commit is contained in:
Dan Morrill 2011-01-13 11:48:42 -08:00
commit b34b504aff
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NOTICE
View File

@ -72,6 +72,15 @@ is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied; not even the implied warranty OF ANY KIND, either express or implied; not even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for Additional Codecs code. ==
=========================================================================
Additional Codecs
These files are Copyright 2003-2010 VisualOn, but released under
the Apache2 License.
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004