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:
4edfe75
5a64b6d
)
resolved conflicts for merge of f7fb5331 to kraken
author
Jean-Baptiste Queru
<jbq@google.com>
Mon, 17 May 2010 20:50:32 +0000
(13:50 -0700)
committer
Jean-Baptiste Queru
<jbq@google.com>
Mon, 17 May 2010 20:50:32 +0000
(13:50 -0700)
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
Trivial merge