OSDN Git Service

Reconcile the merge.
authorYing Wang <wangying@google.com>
Thu, 9 Jan 2014 19:42:04 +0000 (11:42 -0800)
committerYing Wang <wangying@google.com>
Thu, 9 Jan 2014 19:42:04 +0000 (11:42 -0800)
commitcb297d3bd3df589c61f20cb4fbaae4c78c599e7a
tree1c8bbd414fc3fe9bae28e8576d40672d827236d0
parent6a271ead2f29937c51d60d77215e49e8c8f9e1c7
Reconcile the merge.

Change-Id: If3edaedc417e390005b83cbf649b5c1f07a2ea82
core/llvm_config.mk