| commit | 86437bbb6569b6018bf386c7bdeaa70e1c0d81f5 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Oct 30 18:45:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 18:45:26 2014 +0000 |
| tree | 6dd0ebf6e26841d2887e336d78348dff044812cb | |
| parent | dc5cecd8522aa8dfc2b304e67524a11b54ed79c2 [diff] | |
| parent | fbee7f9704febbf81856e7d6d154f71381d95b06 [diff] |
am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" * commit 'fbee7f9704febbf81856e7d6d154f71381d95b06': Cherry-pick: Only use <atomic> for C++11 and newer