OSDN Git Service

resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp
authorColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:32:48 +0000 (16:32 -0800)
committerColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:32:48 +0000 (16:32 -0800)
commita0eb50accabe83b18bd3fe3b9d6417a4718af9e2
treefd015efd5a80c52389592b5fed88c2a9a75ffbea
parent9b2077d4b969e9f8598242915f094552c5d78ad5
parent2fbe5018f94f536541c0137be472e58c79890813
resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp

Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
core/64_bit_blacklist.mk
core/executable.mk
target/product/embedded.mk