diff options
| author | Scott Main <smain@google.com> | 2010-07-15 18:17:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 18:17:16 -0700 |
| commit | 4cb8293bb3e611777cdc6c0a09410839c9dc161f (patch) | |
| tree | 91fc46a5906357909697c5d8d2e1bcd3c064fb0c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e (diff) | |
| parent | d59f1dea1746b316e556df5b4d2080f110aabd1c (diff) | |
am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread
* commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions