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:
c48efe3
804b95e
)
resolved conflicts for merge of 804b95e5 to klp-modular-dev-plus-aosp
author
Paul Jensen
<pauljensen@google.com>
Thu, 3 Apr 2014 23:59:27 +0000
(19:59 -0400)
committer
Paul Jensen
<pauljensen@google.com>
Thu, 3 Apr 2014 23:59:27 +0000
(19:59 -0400)
Change-Id: I124e9342acdb0c9cf0cdcae31f063787c96ab6e2
Trivial merge