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:
81b7df7
4763ef2
)
resolved conflicts for merge of 4763ef2b to master
author
Elliott Hughes
<enh@google.com>
Wed, 17 Jul 2013 20:18:43 +0000
(13:18 -0700)
committer
Elliott Hughes
<enh@google.com>
Wed, 17 Jul 2013 20:18:43 +0000
(13:18 -0700)
Change-Id: I4d424f9fb438c2ed845bca0bbcae69b4d0f5e3dc
Trivial merge