am f35eb149: (-s ours) am 4f2b8b0a: Merge "Remove highp acosh() and atanh() tests...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:21 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:21 +0000 (10:45 +0000)
* commit 'f35eb149d8d8c4510c72c6726629bcc50ac3ed0b':


Trivial merge