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

resolved conflicts for merge of 00118a48 to honeycomb-merge

Browse Source 
Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
This commit is contained in:
Eric Laurent 2011-01-27 18:25:32 -08:00
commit 5e03a5a078
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NOTICE
View File

@ -93,6 +93,7 @@ These files are Copyright (C) 2004-2010 NXP Software and
Copyright (C) 2010 The Android Open Source Project, but released under
the Apache2 License.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/