| commit | 4ce9e23fa7d4dc4646dd08066271ed4cfe71ec60 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 05:13:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:13:05 2015 +0000 |
| tree | f07b202ea380fb956bc11373d8993a1015b55f60 | |
| parent | 9319019a50b70b910902719ef01fc16f3dee7887 [diff] | |
| parent | b1fff84f676d44af8277d68f8122f220538db345 [diff] |
am b1fff84f: (-s ours) am a6d2ff29: am 110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>." * commit 'b1fff84f676d44af8277d68f8122f220538db345':