am 652dd63a: Merge "Remove invalid atomic image compare swap tests from mustpass...
authorMika Isojärvi <misojarvi@google.com>
Mon, 4 May 2015 16:46:33 +0000 (16:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 May 2015 16:46:33 +0000 (16:46 +0000)
automerge: 63f9132

* commit '63f91325aef88dd7842a5065d6f8e5425c84dc2f':
  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