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:
d3708a5
32cc1f8
)
Merge "Replace core-junit with legacy-test"
author
Paul Duffin
<paulduffin@google.com>
Thu, 1 Dec 2016 10:42:16 +0000
(10:42 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 1 Dec 2016 10:42:16 +0000
(10:42 +0000)
am:
32cc1f80e5
Change-Id: Id425eff2aaafdf8ad63bc66ef2d28f71d32d6e8b
1
2
core/config.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/config.mk
Simple merge