diff options
| author | Adrian Roos <roosa@google.com> | 2017-08-03 01:23:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-03 01:23:12 +0000 |
| commit | 1eb98c4d273288d1989bdc6b141fe64c898866b8 (patch) | |
| tree | 1e5c8c86dc8bbe2e0c085c4bab5865436f839c55 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ec599f4477d844ffddbac887eeee53601c16990 (diff) | |
| parent | 64cd09456d67f25ea742783ed9308867583c38dd (diff) | |
Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev am: ad825bdfd7" into oc-mr1-dev-plus-aosp
am: 64cd09456d
Change-Id: I3b87a4a25e69d01526cd5f051cdf9d3553c1ad1c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions