diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2010-09-17 00:05:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 00:05:52 -0700 |
| commit | c62840481f696c01283ca7da9769585c69c6a2d9 (patch) | |
| tree | 14edce3ac206fe1263a48c8e8fc5a71510d5a351 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8b9fbb92327f72d4b3f12a78a6c4f7f7957ae014 (diff) | |
| parent | 63f042cd80dc0ef5833717c226b331581ee1f3b5 (diff) | |
am a79433cb: am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5'
* commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5':
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