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

* commit 'e6d95c6562a43c1d242513acbecb5f4d6c9b9c03':


Trivial merge