am 46fd09d0: am e5fc2a80: Relax fma() verification in builtin_functions.common.fma
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 04:10:49 +0000 (04:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:10:49 +0000 (04:10 +0000)
* commit '46fd09d0c032722c8a1ac294a9757463c42ccd56':


Trivial merge