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

* commit 'b35c86477782d1c58b273addc534443e2ea81ccd':


Trivial merge