| commit | fbee7f9704febbf81856e7d6d154f71381d95b06 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Oct 30 18:41:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 18:41:10 2014 +0000 |
| tree | 34939e3b77e54bb59017b44bef50b0ecfb280015 | |
| parent | b793668bd851c51ba1ff5ab3364bf5619404ea45 [diff] | |
| parent | f8d4dfbff6035e87e941cb75affac86c6d7e144e [diff] |
am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" * commit 'f8d4dfbff6035e87e941cb75affac86c6d7e144e': Cherry-pick: Only use <atomic> for C++11 and newer