am 9caf9fad: am 56cd4770: am a7b6dc7a: am 342b03b5: (-s ours) am ca04416b: am 33c9e11...
authorMika Isojärvi <misojarvi@google.com>
Fri, 28 Aug 2015 18:33:21 +0000 (18:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:33:21 +0000 (18:33 +0000)
commit13c98893518bdbc504f8d809e52b7ece6867e556
tree69eb8d3e14741b2fff2fa8ca752c3a6da5d3941c
parent9a83b05a8d7d184292f4b90b8156d3b31aba6526
parent9caf9fadce960611c813ee9c23bc7154d864bdb1
am 9caf9fad: 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 '9caf9fadce960611c813ee9c23bc7154d864bdb1':