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

* commit 'b400672a587f6953560645ee744b523a7e47ffad':
  Fix atomic ssbo xor test

Change-Id: I05850b429bbc0531ddec889431eb124e06476694


Trivial merge