Merge "Fix atomic ssbo xor test" into nyc-dev am: b400672
authorMika Isojarvi <misojarvi@google.com>
Thu, 14 Apr 2016 20:09:23 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 20:09:23 +0000 (20:09 +0000)
am: d8d01e3

* commit 'd8d01e349fefb332ef8f6a313668dd8ddb968e29':
  Fix atomic ssbo xor test

Change-Id: Iafa1e62a96ad2355e20c74a9f67304983a39e4af


Trivial merge