OSDN Git Service

resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 01:37:45 +0000 (17:37 -0800)
committerYing Wang <wangying@google.com>
Wed, 26 Feb 2014 01:37:45 +0000 (17:37 -0800)
commit12c909b20c2a1f8be74914186e54c4143ddc263e
tree051ed32b3c3d63bb8d50f5c657f3f590e7cab3e3
parent331272f94bc85c5eb9853e726c024375f691ab59
parent9057f619c319f30c95a3dfeb73904a6bbe2b891e
resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e
core/64_bit_blacklist.mk