| commit | 6a271ead2f29937c51d60d77215e49e8c8f9e1c7 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 09 11:12:12 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Jan 09 11:18:40 2014 -0800 |
| tree | b592260b5e8043b2376771bef49c9d20711515c8 | |
| parent | af5ad49846030dfb03cdaa7b20fe63384904d894 [diff] | |
| parent | 948786c978da2ead1a4701fce7af6c740526f989 [diff] |
resolved conflicts for merge of 948786c9 to master Conflicts: core/llvm_config.mk Change-Id: Icfe11ad432c39efdf281ba0ab3cffb1011789cce