Add support for rendering vertex combined sampled images. am: 5fe6837872
authorMika Isojrvi <misojarvi@google.com>
Mon, 8 Aug 2016 23:40:21 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 23:40:21 +0000 (23:40 +0000)
am: 6003e58af4

Change-Id: I5ee08c425b0ac3007a1d0f5e5b8aed6da03a436d


Trivial merge