am 33c9e110: am cee84aa0: am 652dd63a: Merge "Remove invalid atomic image compare...
authorMika Isojärvi <misojarvi@google.com>
Fri, 28 Aug 2015 04:25:09 +0000 (04:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:25:09 +0000 (04:25 +0000)
* commit '33c9e11055714b02fa38edcd44a45379f29a3d50':

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

Simple merge