diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2010-09-17 00:03:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 00:03:32 -0700 |
| commit | 63f042cd80dc0ef5833717c226b331581ee1f3b5 (patch) | |
| tree | 7400539746038f7c4f8603c749065ef72400b4be /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3fcfb4e68bdbac5282fae1b710f5f60481f4c3ff (diff) | |
| parent | c2f4b6096d042838340d408167206d2767190729 (diff) | |
am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp
* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
Initialize Keyboard.Key attributes from parent Keyboard.Row
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions