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:
1d83ed6
5615003
)
resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Mon, 11 Oct 2010 16:38:10 +0000
(09:38 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Mon, 11 Oct 2010 16:38:10 +0000
(09:38 -0700)
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
Trivial merge