OSDN Git Service
(root)
/
android-x86
/
bionic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0acdbe0
6cda7b6
)
resolved conflicts for merge of 6cda7b62 to gingerbread-plus-aosp
author
David 'Digit' Turner
<digit@google.com>
Fri, 30 Sep 2011 03:56:51 +0000
(
05:56
+0200)
committer
David 'Digit' Turner
<digit@google.com>
Fri, 30 Sep 2011 03:56:51 +0000
(
05:56
+0200)
Change-Id: I85bd5291c2a9cd29bff538b6d5a4dcd73f85a1fd
Trivial merge