am 652dd63a: Merge "Remove invalid atomic image compare swap tests from mustpass...
authorMika Isojärvi <misojarvi@google.com>
Fri, 13 Mar 2015 18:28:22 +0000 (18:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Mar 2015 18:28:22 +0000 (18:28 +0000)
commit63f91325aef88dd7842a5065d6f8e5425c84dc2f
tree4f818a8637f283012f7aeb83afda9ff602db4bee
parent09fb821632a3e20025b82f94af0d2a21ced7c82d
parent652dd63a2f6823e19ce7368ef9bf31fd169b4348
am 652dd63a: Merge "Remove invalid atomic image compare swap tests from mustpass." into lmp-sprout-dev

* commit '652dd63a2f6823e19ce7368ef9bf31fd169b4348':
  Remove invalid atomic image compare swap tests from mustpass.
android/cts/com.drawelements.deqp.gles31.xml
android/cts/es31-lmp.txt