am 193d4ea0: Merge "Remove use of transform feedback from ShaderExecutor"
authorPyry Haulos <phaulos@google.com>
Tue, 15 Sep 2015 21:38:57 +0000 (21:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 21:38:57 +0000 (21:38 +0000)
* commit '193d4ea027b97723ead2f85bf01a31a235b47dbf':
  Remove use of transform feedback from ShaderExecutor


Trivial merge