diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-05-06 17:31:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 17:31:49 -0700 |
| commit | e0c5b61d2d7ef1c26ec06a4de3db5858a66097f0 (patch) | |
| tree | 98f63c0ca82ba9f2eee4cdebeddaa966c0831431 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 47f8bc92da55570d06ad40790eda11c48db2f97c (diff) | |
| parent | a1abd2133d13f05cdfd3f6c9fb5be92b9bd2063d (diff) | |
am 94886d97: am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions