diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-08-03 01:35:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-03 01:35:10 +0000 |
| commit | 1004312c2c4d6bb0c4cc3a4bf949fa623e0bcbed (patch) | |
| tree | 2feb6bade904f5d020cf73f564614f016a9d6a86 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b9ad0772f681e2ca6b6db8463cd0f8ef52431e09 (diff) | |
| parent | 9fb2386b27c07053894692e9b35af23ed7385511 (diff) | |
Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev am: 7606d4798b
am: 9fb2386b27
Change-Id: Ibb66f14f6f172fac57ea9070f2c8080f60daf0fe
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions