diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 16:00:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 16:00:01 -0700 |
| commit | ad3f4a4561385af969e3e7ff280b59d842c6eb0b (patch) | |
| tree | 95f571bce595bd01cee3160711fcbb447afa3fc5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b0151801a0c20c3e1d406c7f47af8ba57aff758f (diff) | |
| parent | 30f71ce5971b5a129e134b7a1fb8c2e53a50f23f (diff) | |
am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken
* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
Add new keycodes for the convenience of Japanese IMEs
Call register_localized_collators() with the current locale.
Fixed deserialization problem in DatePicker.
Fix for bug 2467152 files with spaces fail to open.
Set alpha value for newly created dim surface.
telephony: Fix CID when CID is unknown
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions