Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20
authorMika Isojrvi <misojarvi@google.com>
Wed, 19 Jul 2017 18:10:30 +0000 (18:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 18:10:30 +0000 (18:10 +0000)
am: cae1fe52ac

Change-Id: Iad44b21021d6f24b0d6c126cf81cf24632a0aaab


Trivial merge