diff options
| author | Dan Morrill <morrildl@google.com> | 2011-01-13 11:48:42 -0800 |
|---|---|---|
| committer | Dan Morrill <morrildl@google.com> | 2011-01-13 11:48:42 -0800 |
| commit | 8cc7c34c1b817469967d09daf3525a9d84783563 (patch) | |
| tree | 52e87edcee1ac84da8948f40087f9cb291909f12 | |
| parent | 5ab7ccdd37ad525a72392e9ae9d4960eba901bbd (diff) | |
| parent | c506ab89505f7adf5411f2418e48ea67acf03700 (diff) | |
| download | frameworks_base-8cc7c34c1b817469967d09daf3525a9d84783563.zip frameworks_base-8cc7c34c1b817469967d09daf3525a9d84783563.tar.gz frameworks_base-8cc7c34c1b817469967d09daf3525a9d84783563.tar.bz2 | |
Fix merge conflict for 'c506ab89'
Conflicts:
NOTICE
Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
| -rw-r--r-- | NOTICE | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -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 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 Version 2.0, January 2004 |