am e2c5926d: am ffc5abcd: (-s ours) am 8104ce21: Remove highp scalar reflect tests...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:47:07 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:07 +0000 (14:47 +0000)
* commit 'e2c5926db56950efd9fea12d70bc2b92535f5d3c':


Trivial merge