OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c06964
901d792
)
resolved conflicts for merge of 901d792c to mnc-dev-plus-aosp
author
Nick Kralevich
<nnk@google.com>
Mon, 11 May 2015 18:29:43 +0000
(11:29 -0700)
committer
Nick Kralevich
<nnk@google.com>
Mon, 11 May 2015 18:29:43 +0000
(11:29 -0700)
Change-Id: I63fbc397ba28c832857bf7e27e8f1798e789a6e1
Trivial merge