am ee21ef8f: am e4f3fba6: Remove invalid atomic image compare swap tests from mustpas...
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:35:33 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:35:33 +0000 (19:35 +0000)
am: 3e0b3138a0

* commit '3e0b3138a0797d56ae5abe996ee1edf5cb860afe':


Trivial merge