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:
28462eb
d5b427b
)
resolved conflicts for merge of 1a2344b8 to master
author
Jean-Baptiste Queru
<jbq@google.com>
Thu, 18 Nov 2010 01:31:25 +0000
(17:31 -0800)
committer
Jean-Baptiste Queru
<jbq@google.com>
Thu, 18 Nov 2010 01:31:25 +0000
(17:31 -0800)
Change-Id: I974f7f388ddc74d661f07fda1e308e7c15e00dfc
Trivial merge