OSDN Git Service

resolved conflicts for merge of d616a73d to master
authorYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:26:38 +0000 (10:26 -0800)
committerYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:27:35 +0000 (10:27 -0800)
commit30d8e12c87bc6232a786a6f66d2e2aee2e95fa1a
treed20b67e83879022aa7cf79c74dee80040b92b73a
parente3ae5a467799f063ebdcfe85786b0f625a30d4ad
parentd616a73db2ab44683f3b623dc8fea313b3c082eb
resolved conflicts for merge of d616a73d to master

Change-Id: I92007bc1c4987c9601b5478b06e3bbe3c02b9535
core/clang/config.mk
core/config.mk