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:
53aae1a
cb6e72f
)
resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
author
Dimitry Ivanov
<dimitry@google.com>
Fri, 26 Aug 2016 22:38:26 +0000
(15:38 -0700)
committer
Dimitry Ivanov
<dimitry@google.com>
Fri, 26 Aug 2016 22:38:26 +0000
(15:38 -0700)
Change-Id: Ibe680bbc473fc5ce1ced2d50e1b8e20149a59a08
Trivial merge