tree 1ee67c550c5aa47923d824193e3ae38145c5a813
parent 3356457a94d3e0754479832ac18cdf202c36cdaf
parent 11728ce9bbfaaf3599566b94d6a4207fde749beb
author Andrew Hsieh <andrewhsieh@google.com> 1387937536 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387937536 -0800

am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."

* commit '11728ce9bbfaaf3599566b94d6a4207fde749beb':
  Workaround the __builtin_isnan() type error for clang 3.4.