diff options
author | Jim Miller <jaggies@google.com> | 2011-10-26 15:40:08 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-26 15:40:08 -0700 |
commit | 9ebc59ce340ca06cb9550a6cd457f6e167e08249 (patch) | |
tree | 28eee3f42811afd37db117e8ea5ec72270f61958 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | a6137a5b11b8d8b4aff45dacadefb131e88826c4 (diff) | |
parent | c36fb99baa78c2d9e58307d0f7c59270b0600d24 (diff) |
Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions