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:
9560aab
a0eeb0b
)
resolved conflicts for merge of a0eeb0b6 to lmp-dev-plus-aosp
author
Elliott Hughes
<enh@google.com>
Thu, 28 Aug 2014 03:03:04 +0000
(20:03 -0700)
committer
Elliott Hughes
<enh@google.com>
Thu, 28 Aug 2014 03:03:04 +0000
(20:03 -0700)
Change-Id: I84193689c0d6a9ee70b8da3c509694eb6d747d4a
Trivial merge