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:
c70d479
95ac6db
)
resolved conflicts for 95ac6dbb to mnc-dr-dev-plus-aosp
author
Dmitriy Ivanov
<dimitry@google.com>
Thu, 15 Oct 2015 01:41:36 +0000
(18:41 -0700)
committer
Dmitriy Ivanov
<dimitry@google.com>
Thu, 15 Oct 2015 01:41:36 +0000
(18:41 -0700)
Change-Id: I8937cd33aa375824965d4f919038a99b30ab75ea
Trivial merge