am 56cd4770: am a7b6dc7a: am 342b03b5: (-s ours) am ca04416b: am 33c9e110: am cee84aa...
authorMika Isojärvi <misojarvi@google.com>
Fri, 28 Aug 2015 18:24:58 +0000 (18:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:24:58 +0000 (18:24 +0000)
commit9caf9fadce960611c813ee9c23bc7154d864bdb1
treeb52b7861d0b8df4140b55895a04ce5db643760ba
parent806a9cd39d622a29666fdb96c92b779625018c7c
parent56cd477015d45d87bd4622b90d44c2ba7cd6a991
am 56cd4770: am a7b6dc7a: am 342b03b5: (-s ours) am ca04416b: am 33c9e110: am cee84aa0: am 652dd63a: Merge "Remove invalid atomic image compare swap tests from mustpass." into lmp-sprout-dev

* commit '56cd477015d45d87bd4622b90d44c2ba7cd6a991':