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:
348eae4
9ce09e4
)
resolve merge conflicts of 9ce09e4 to nyc-dev-plus-aosp
author
Elliott Hughes
<enh@google.com>
Tue, 29 Mar 2016 18:27:27 +0000
(11:27 -0700)
committer
Elliott Hughes
<enh@google.com>
Tue, 29 Mar 2016 18:27:27 +0000
(11:27 -0700)
Change-Id: I0b5ac686e45c685e5168a0870570589e2eb82488
Trivial merge