Merge "Fix atomic ssbo xor test" into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Thu, 14 Apr 2016 19:50:18 +0000 (19:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Apr 2016 19:50:19 +0000 (19:50 +0000)

Trivial merge