diff options
| author | Kenny Root <kroot@google.com> | 2011-08-02 17:05:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-02 17:05:06 -0700 |
| commit | f3b73ee8d9c09aca8fc9b93b9055f46e0eb1a430 (patch) | |
| tree | 81da39191cdbab74d232a6b9cdf16068741bd6fd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 67c063b1c013123b4f4a0539fac9fc8d53130205 (diff) | |
| parent | f7195e75798ef6760a1decac49002da6011f5b71 (diff) | |
Merge "Parent's canonical path; not parent of canonical"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions