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:
2409514
ea8dea8
)
resolved conflicts for merge of ea8dea8c to lmp-mr1-dev-plus-aosp
author
Elliott Hughes
<enh@google.com>
Tue, 7 Oct 2014 20:33:09 +0000
(13:33 -0700)
committer
Elliott Hughes
<enh@google.com>
Tue, 7 Oct 2014 20:33:09 +0000
(13:33 -0700)
Change-Id: I368c83e83c56a0c14d395540a715f5c42f8eafa8
Trivial merge