Merge "Fix non-matching varying invariance in GLES2 preprocessor test."
authorJarkko Pöyry <jpoyry@google.com>
Wed, 15 Apr 2015 00:22:09 +0000 (00:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Apr 2015 00:22:10 +0000 (00:22 +0000)

Trivial merge