OSDN Git Service

resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Mon, 20 Oct 2014 20:38:43 +0000 (13:38 -0700)
committerDan Albert <danalbert@google.com>
Mon, 20 Oct 2014 20:38:43 +0000 (13:38 -0700)
commit7162996734fbd2b3c0aaf63db842f2fc48bc95bb
tree666b39be4820702bb20abb491391243745f7daf9
parent52b4d2f0964feea351e931a32a0671424dc00583
parent96c22133af53974a8e55412840338c2e29140298
resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp

Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34
core/binary.mk
core/clang/config.mk