diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-20 19:31:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:31:35 +0000 |
| commit | b1fff84f676d44af8277d68f8122f220538db345 (patch) | |
| tree | 16efb60c62402371b8df5ff3e0df91f2d995959e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 43ab57ccbf2c0adfad5298b662675b59e52b2e01 (diff) | |
| parent | a6d2ff29c4920b440b16bc6ceaa90710361b9be9 (diff) | |
am a6d2ff29: am 110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."
* commit 'a6d2ff29c4920b440b16bc6ceaa90710361b9be9':
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions