am 49d34a23: (-s ours) am 521e5c62: Merge "Remove textureprojlodoffset.sampler3d_floa...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:50:50 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:50 +0000 (19:50 +0000)
am: 3ef1ce617e

* commit '3ef1ce617eef15afc3da964f81f5cb344451081d':


Trivial merge