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:
331272f
9057f61
)
resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp
author
Ying Wang
<wangying@google.com>
Wed, 26 Feb 2014 01:37:45 +0000
(17:37 -0800)
committer
Ying Wang
<wangying@google.com>
Wed, 26 Feb 2014 01:37:45 +0000
(17:37 -0800)
Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e
1
2
core/64_bit_blacklist.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/64_bit_blacklist.mk
Simple merge