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