am 828dcfd7: am 27dce39a: am 652dd63a: Merge "Remove invalid atomic image compare...
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:29:55 +0000 (19:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:29:55 +0000 (19:29 +0000)
am: f46b2fe6b3

* commit 'f46b2fe6b30b4966df5b5ac609430d4e04edf69d':


Trivial merge