am ee21ef8f: am e4f3fba6: Remove invalid atomic image compare swap tests from mustpas...
authorMika Isojärvi <misojarvi@google.com>
Mon, 4 May 2015 17:08:14 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:08:14 +0000 (17:08 +0000)
* commit 'ee21ef8fae99d964d5606191d14bfd1bb01d3161':


Trivial merge