OSDN Git Service
(root)
/
android-x86
/
libcore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfc0713
e595037
)
am e595037c: resolved conflicts for merge of bc411e69 to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Tue, 17 Aug 2010 23:01:05 +0000
(16:01 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 17 Aug 2010 23:01:05 +0000
(16:01 -0700)
Merge commit '
e595037cf49109e9e20b47e6e191eda45e414008
'
* commit '
e595037cf49109e9e20b47e6e191eda45e414008
':
Fix compilation error: invalid conversion from 'const char*' to 'char*'.
Trivial merge