| commit | 7ae8df961ebf4f2be39e052fd1c29755cf729929 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue May 13 15:17:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:17:33 2014 +0000 |
| tree | 159b54467091f0dcf043991bec8ba0cec5e05255 | |
| parent | 5a4d23727ed9bb6e4459d64884a38c5d009bc7a8 [diff] | |
| parent | 1822cbc2cc3ab86d0ff8e1f72529876c7b02ad7b [diff] |
am 1822cbc2: am d445647f: am 575bd012: am d9abded2: am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4." * commit '1822cbc2cc3ab86d0ff8e1f72529876c7b02ad7b':