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:
7eea57b
e02856c
)
resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Tue, 17 Aug 2010 14:41:59 +0000
(07:41 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Tue, 17 Aug 2010 14:41:59 +0000
(07:41 -0700)
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761
Trivial merge