am a2d25ce9: Fix out-of-bounds buffer access in tese ShaderExecutor am: 7d64dcad47...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:54:07 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:07 +0000 (19:54 +0000)
am: b000c52f96

* commit 'b000c52f964b224451ac7720c3c6128e3eb4f081':


Trivial merge