am 8a95e17f: (-s ours) am 40ff5281: Remove another textureLodOffset() case from mustpass
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:46:01 +0000 (10:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:46:01 +0000 (10:46 +0000)
* commit '8a95e17fdbf21b589d76223d18254b4e7258ec4b':


Trivial merge