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:
94ea04c
b2eb09a
)
resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp
author
Elliott Hughes
<enh@google.com>
Sun, 31 Aug 2014 05:30:48 +0000
(22:30 -0700)
committer
Elliott Hughes
<enh@google.com>
Sun, 31 Aug 2014 05:30:48 +0000
(22:30 -0700)
Change-Id: I0208958d78d6d7bc8c41568aa9abee15605b951e
Trivial merge