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)
Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e

1  2 
core/64_bit_blacklist.mk

Simple merge