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:
ae1f9dc
3bffa05
)
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Thu, 18 Nov 2010 00:47:59 +0000
(16:47 -0800)
committer
Jean-Baptiste Queru
<jbq@google.com>
Thu, 18 Nov 2010 00:47:59 +0000
(16:47 -0800)
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
Trivial merge