| commit | 090bce830f5deca6fba8df45a0e749b5cb9b6e8b | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Oct 30 18:50:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 18:50:59 2014 +0000 |
| tree | 5a3f3be822bb4bf168cfd964b1430737e1b60ea1 | |
| parent | 1a93df5e05d1640b2cf78d3ad70b99ba802163cc [diff] | |
| parent | 86437bbb6569b6018bf386c7bdeaa70e1c0d81f5 [diff] |
am 86437bbb: am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" * commit '86437bbb6569b6018bf386c7bdeaa70e1c0d81f5': Cherry-pick: Only use <atomic> for C++11 and newer