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:
6392466
84a20ac
)
am 84a20ac1: am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular...
author
Colin Cross
<ccross@android.com>
Fri, 21 Feb 2014 18:35:04 +0000
(10:35 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Feb 2014 18:35:04 +0000
(10:35 -0800)
* commit '
84a20ac12e07109f5682d77a131f25995f7c2d0e
':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Trivial merge