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