diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-07 22:33:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 22:33:07 +0000 |
| commit | 3b025f13025290f088e1206a0808034bacdf2cff (patch) | |
| tree | 27e5e03f98cebbebc24671dfa8d66510276256ab /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d1fe6bba7894bd6d44eb5c2cc0f32bdbd2c9c32e (diff) | |
| parent | 6b4f28a7930c115f4b9e0d4fdfcd41b3bb58bf58 (diff) | |
am 6b4f28a7: am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master
* commit '6b4f28a7930c115f4b9e0d4fdfcd41b3bb58bf58':
libgui: Plumb attach/detach through Surface
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions