diff options
author | Peter Ng <petergng@google.com> | 2011-10-28 10:53:54 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-28 10:53:54 -0700 |
commit | ff05f3f03da8f97f8dd3169255e9ed85b961828b (patch) | |
tree | 1c2aee418bc78773aff239d56f29b6c3cfdfb30e /opengl/tests/gl_basic/gl_basic.cpp | |
parent | c57268ee93c7ec48ae4925da4461f8db26eca36e (diff) | |
parent | c36fb99baa78c2d9e58307d0f7c59270b0600d24 (diff) |
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions