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:
b33d890
0163239
)
resolved conflicts for merge of 01632399 to lmp-dev-plus-aosp
author
Dan Albert
<danalbert@google.com>
Mon, 11 Aug 2014 17:58:46 +0000
(10:58 -0700)
committer
Dan Albert
<danalbert@google.com>
Mon, 11 Aug 2014 17:58:46 +0000
(10:58 -0700)
Change-Id: I7744ba85e1964926532f4327ffbc8dcef3c85891
Trivial merge