tree 176e0a3fa284a1e043c12f4e9d15e62db730945f
parent 13ed4615caf78951535ebf8b7f4b633ba1c41b85
parent 443a75e4d97e02e2d29a86a391bd844c93e627fd
author Chih-Hung Hsieh <chh@google.com> 1418924986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418924986 +0000

am 443a75e4: Merge "Disable clang assembler, to fix asm code later."

* commit '443a75e4d97e02e2d29a86a391bd844c93e627fd':
  Disable clang assembler, to fix asm code later.