OSDN Git Service

am 30d8e12c: resolved conflicts for merge of d616a73d to master
authorYing Wang <wangying@google.com>
Fri, 21 Feb 2014 18:34:50 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:50 +0000 (10:34 -0800)
* commit '30d8e12c87bc6232a786a6f66d2e2aee2e95fa1a':
  Refactor llvm_config.mk and support the 2nd arch


Trivial merge