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:
a4eda94
d227b61
)
resolve merge conflicts of d227b61 to nyc-dev-plus-aosp
author
Dimitry Ivanov
<dimitry@google.com>
Thu, 28 Apr 2016 05:21:31 +0000
(22:21 -0700)
committer
Dimitry Ivanov
<dimitry@google.com>
Thu, 28 Apr 2016 05:21:31 +0000
(22:21 -0700)
Change-Id: I27136bf06295898584ba6cac3a81bec9c9b70f05
Trivial merge