diff options
| author | Pablo Ceballos <pceballos@google.com> | 2016-06-06 19:37:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-06 19:37:38 +0000 |
| commit | d21cb6d2d9a5819c3427df1be4470bcc8baf3c6a (patch) | |
| tree | a9bc50e8446e138cbea22c30febc0dbd3656bc39 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fbcc332c85cb856633d72088a65f55277f5fee23 (diff) | |
| parent | d224e6111bf4532fb1c1fc021c20285b38bc80ec (diff) | |
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am: d224e6111b
* commit 'd224e6111bf4532fb1c1fc021c20285b38bc80ec':
SF: Also edit currentState in doTransaction
Change-Id: I6bcd675d033cc1ef46d3498174b2bc52a0072f99
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions