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:
ff8048b
966611a
)
resolved conflicts for merge of 966611a9 to master-nova
author
Brian Carlstrom
<bdc@google.com>
Fri, 21 Feb 2014 18:29:55 +0000
(10:29 -0800)
committer
Brian Carlstrom
<bdc@google.com>
Fri, 21 Feb 2014 18:29:55 +0000
(10:29 -0800)
Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a
1
2
CleanSpec.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CleanSpec.mk
Simple merge