Merge "DO NOT MERGE Add workaround for incorrect array-bounds warning in glsDrawTest...
authorPyry Haulos <phaulos@google.com>
Tue, 18 Nov 2014 17:18:19 +0000 (17:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Nov 2014 17:18:19 +0000 (17:18 +0000)

Trivial merge