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:
1dca55f
0287a8f
)
resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
author
Konstantinos Menychtas
<kmenychtas@google.com>
Tue, 25 Aug 2015 17:20:11 +0000
(10:20 -0700)
committer
Konstantinos Menychtas
<kmenychtas@google.com>
Tue, 25 Aug 2015 17:26:22 +0000
(17:26 +0000)
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
1
2
target/board/generic/BoardConfig.mk
patch
|
diff1
|
diff2
|
blob
|
history
target/board/generic_mips/BoardConfig.mk
patch
|
diff1
|
diff2
|
blob
|
history
target/board/generic_x86/BoardConfig.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
target/board/generic/BoardConfig.mk
Simple merge
diff --cc
target/board/generic_mips/BoardConfig.mk
Simple merge
diff --cc
target/board/generic_x86/BoardConfig.mk
Simple merge
OSDN Git Service
