am f35eb149: (-s ours) am 4f2b8b0a: Merge "Remove highp acosh() and atanh() tests...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:45:23 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:45:23 +0000 (19:45 +0000)
am: 0308430a5f

* commit '0308430a5fef8e8654f8e09acd9f94e549b4369e':


Trivial merge