diff options
| author | Greg Kaiser <gkaiser@google.com> | 2018-01-08 22:03:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 22:03:50 +0000 |
| commit | bdae91fdef733b7f2f0871f6acf52dd3b854346e (patch) | |
| tree | d992fc295ec26fc4efaa93ebd387e2ba2d852535 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b3b453659bd9918c1b5e29a7c3071973e10e00f3 (diff) | |
| parent | 50704e6d5972e2f6e230f8d04a1f78e32cd0984f (diff) | |
Merge "surfaceflinger: Initialize Description field" am: 5fcdccab6f am: b9c594f32a
am: 50704e6d59 -s ours
Change-Id: Iaae91847702f7554710ad142652e0e20d81d855a
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions