| commit | 37f11668f83460a2a744c3d7f3381ea589bc643e | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Oct 30 18:45:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 18:45:23 2014 +0000 |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f | |
| parent | 0571dfbb0315dd1bdf3939dcb197bb6094744c4f [diff] | |
| parent | 37803394ec494aad7b39bd1a447e975da596eadc [diff] |
am 37803394: am bb3b5843: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" * commit '37803394ec494aad7b39bd1a447e975da596eadc': Cherry-pick: Only use <atomic> for C++11 and newer