am e0f289e8: am 63f91325: am 652dd63a: Merge "Remove invalid atomic image compare...
authorMika Isojärvi <misojarvi@google.com>
Fri, 13 Mar 2015 18:56:40 +0000 (18:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Mar 2015 18:56:40 +0000 (18:56 +0000)
* commit 'e0f289e8660821a64e82eec23d0b317c145a4b9a':
  Remove invalid atomic image compare swap tests from mustpass.

1  2 
android/cts/com.drawelements.deqp.gles31.xml
android/cts/es31-lmp.txt

Simple merge