am 49d34a23: (-s ours) am 521e5c62: Merge "Remove textureprojlodoffset.sampler3d_floa...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:43 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:43 +0000 (10:45 +0000)
commitee8acf089a8537c13fa849734b31f20329c37680
tree24002cae96d2478d3b77fc893c656ebfacb48803
parent7f95ab172137942d2d27b8f1823630d6e8fb4239
parent49d34a233448603cd16cfc574e439761f1d969cf
am 49d34a23: (-s ours) am 521e5c62: Merge "Remove textureprojlodoffset.sampler3d_float_vertex from mustpass" into mnc-dev

* commit '49d34a233448603cd16cfc574e439761f1d969cf':