am ee8acf08: am 49d34a23: (-s ours) am 521e5c62: Merge "Remove textureprojlodoffset...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:46 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:46 +0000 (14:46 +0000)
commitdb642b1e457dc9967aa23133757ba027cc732adf
treeb52b7861d0b8df4140b55895a04ce5db643760ba
parent60aed4f392f8159ea05f6df38445c9eacad71a32
parentee8acf089a8537c13fa849734b31f20329c37680
am ee8acf08: am 49d34a23: (-s ours) am 521e5c62: Merge "Remove textureprojlodoffset.sampler3d_float_vertex from mustpass" into mnc-dev

* commit 'ee8acf089a8537c13fa849734b31f20329c37680':