diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-07 15:00:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-07 15:00:05 -0800 |
| commit | 7c3885169df109dcaae0811eeac936b2a4719a93 (patch) | |
| tree | 9fa28504c975a2655235902d169f9da6fef8d301 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 62fecd50663cf9157849c179ad61d609e2b3a28f (diff) | |
| parent | 9e566e261627e97cb18449bc89d9abca53b77b77 (diff) | |
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions