OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1434045
ffcdad0
)
resolved conflicts for merge of 00118a48 to honeycomb-merge
author
Eric Laurent
<elaurent@google.com>
Fri, 28 Jan 2011 02:25:32 +0000
(18:25 -0800)
committer
Eric Laurent
<elaurent@google.com>
Fri, 28 Jan 2011 02:25:32 +0000
(18:25 -0800)
Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
1
2
NOTICE
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
NOTICE
index
1c93e9f
,
c45f010
..
462d5ae
---
1
/
NOTICE
---
2
/
NOTICE
+++ b/
NOTICE
@@@
-93,6
-74,6
+93,7
@@@
These files are Copyright (C) 2004-201
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/
OSDN Git Service
