tree 1d67d6f4d613b9a87cb22e9f96cfe743218f8cbc
parent b7cbfd46bb4de687db2b99d0116d21e3226d3f59
parent f63954197ea5e1fa300fa6c561e2f5b0a67d2d1f
author Chih-Hung Hsieh <chh@google.com> 1411491296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411491296 +0000

am f6395419: Merge "Move Clang only flags into LOCAL_CLANG_CFLAGS."

* commit 'f63954197ea5e1fa300fa6c561e2f5b0a67d2d1f':
  Move Clang only flags into LOCAL_CLANG_CFLAGS.