am dadc782c: resolved conflicts for merge of 81fe2b16 to lmp-mr1-dev-plus-aosp

* commit 'dadc782cf01ebfb1dc3401352450922a9d644614':
  Enable clang compilation with libc but not linker.
This commit is contained in:
Dmitriy Ivanov 2014-10-02 18:10:01 +00:00 committed by Android Git Automerger
commit 0427f87378

Diff Content Not Available