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:
f2aaceb
3c5c720
)
resolved conflicts for merge of de01780f to lmp-mr1-dev-plus-aosp
author
Dmitriy Ivanov
<dimitry@google.com>
Wed, 22 Oct 2014 17:13:08 +0000
(10:13 -0700)
committer
Dmitriy Ivanov
<dimitry@google.com>
Wed, 22 Oct 2014 17:13:08 +0000
(10:13 -0700)
Change-Id: Ibed1ba1f52da7222f534011866515cfce790061f
Trivial merge