diff options
| author | Peter Ng <petergng@google.com> | 2011-10-28 22:27:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 22:27:13 +0000 |
| commit | d714e3a1ff559dd9d22c87ed904be2a82692fcf8 (patch) | |
| tree | 55b1e64d15d96c0cad7e57e696aea66235a542c3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1bc7d4b192ccba43f55ed7003763147265cf3d44 (diff) | |
| parent | 63dd319ebeea0421f8bf901b85b753dde1de74d7 (diff) | |
am 63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
* commit '63dd319ebeea0421f8bf901b85b753dde1de74d7':
Lockscreen on tablet is now using the same waveview widget as phone
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions