diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-09 14:57:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:57:48 -0800 |
| commit | 001e423026738b76f0a116f17bb9e3026a55a1dc (patch) | |
| tree | 8cef08e323746a2ae01800c70e083ad67d7fcb9a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3a51491c7ee822792ef1e6767055a45cc4e9b3e6 (diff) | |
| parent | ddbd1fd2bd09e7252464b3b2b4e9d2f37bcc155e (diff) | |
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions