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:
46a091f
e1fe52c
)
resolved conflicts for merge of e1fe52cc to klp-dev-plus-aosp
author
Elliott Hughes
<enh@google.com>
Mon, 7 Oct 2013 22:10:00 +0000
(15:10 -0700)
committer
Elliott Hughes
<enh@google.com>
Mon, 7 Oct 2013 22:10:00 +0000
(15:10 -0700)
Change-Id: Id3f3176a842fb4bb45f4f48773e6e27ea7d8769f
Trivial merge