am 67fa8c54: am 2e736e5c: Fix derivate offset in cube map verification code
authorPyry Haulos <phaulos@google.com>
Fri, 30 Jan 2015 02:26:51 +0000 (02:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jan 2015 02:26:51 +0000 (02:26 +0000)
* commit '67fa8c5472adfcad106901e7fad1e76ede4f79a1':
  Fix derivate offset in cube map verification code


Trivial merge