am 828dcfd7: am 27dce39a: am 652dd63a: Merge "Remove invalid atomic image compare...
authorMika Isojärvi <misojarvi@google.com>
Mon, 4 May 2015 17:08:13 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:08:13 +0000 (17:08 +0000)
* commit '828dcfd7e47cff9c770db152c007ae5b63e58727':


Trivial merge