| commit | 5cf48d73a91e3ccbaf400038ad4cfb29738ec9b4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 21:42:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:42:50 2015 +0000 |
| tree | 46e38a8bafed8a10a35b52d1fc87cfd376225b4d | |
| parent | 7a068fa61a2b5fef9c4bf1507c567b4b69da0da7 [diff] | |
| parent | 4ce9e23fa7d4dc4646dd08066271ed4cfe71ec60 [diff] |
am 4ce9e23f: am b1fff84f: (-s ours) am a6d2ff29: am 110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>." * commit '4ce9e23fa7d4dc4646dd08066271ed4cfe71ec60':