am 8a95e17f: (-s ours) am 40ff5281: Remove another textureLodOffset() case from mustp...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:49:16 +0000 (19:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:49:16 +0000 (19:49 +0000)
am: c675b40d3e

* commit 'c675b40d3edf82005cea7534cd2db2da34105a0d':


Trivial merge