OSDN Git Service

resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Mon, 3 Mar 2014 12:14:41 +0000 (12:14 +0000)
committerNarayan Kamath <narayan@google.com>
Mon, 3 Mar 2014 12:14:41 +0000 (12:14 +0000)
commit3246d88d6c71cceec967241337f9da33e1b12d02
treee98c3eed9f9aee27bd1c93319455686fb5d29d77
parent0c0e9b815332eca3b3626cc9c47759bbf5e48624
parente8bb5c3a54c1bcf798689ad664233e34af059f4c
resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b
core/64_bit_blacklist.mk