OSDN Git Service

resolved conflicts for merge of 948786c9 to master
authorYing Wang <wangying@google.com>
Thu, 9 Jan 2014 19:12:12 +0000 (11:12 -0800)
committerYing Wang <wangying@google.com>
Thu, 9 Jan 2014 19:18:40 +0000 (11:18 -0800)
commit6a271ead2f29937c51d60d77215e49e8c8f9e1c7
treeb592260b5e8043b2376771bef49c9d20711515c8
parentaf5ad49846030dfb03cdaa7b20fe63384904d894
parent948786c978da2ead1a4701fce7af6c740526f989
resolved conflicts for merge of 948786c9 to master

Conflicts:
core/llvm_config.mk

Change-Id: Icfe11ad432c39efdf281ba0ab3cffb1011789cce
core/definitions.mk
core/llvm_config.mk