am 0308430a: am f35eb149: (-s ours) am 4f2b8b0a: Merge "Remove highp acosh() and...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:32 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:32 +0000 (14:46 +0000)
* commit '0308430a5fef8e8654f8e09acd9f94e549b4369e':


Trivial merge