am 52c6fc29: (-s ours) am b5d33660: Fix scaling of precision for mediump sin/cos/tan
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:14 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:14 +0000 (10:45 +0000)
* commit '52c6fc29966e8d4f53aa450e03bb0fcfa6e03598':


Trivial merge