diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-08 19:01:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 19:01:37 -0700 |
| commit | 7d1588e4e3b37b7f480618e111d78eb102b5ac1e (patch) | |
| tree | eed30068eabef368184db5d7854b914a684bf35c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b91d1dc00af9b14f858d083aa78903a9a25664de (diff) | |
| parent | b1ef9664ada21330249b82611f72a8e10cf607c6 (diff) | |
am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp
* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
add a fps counter to sanangeles demo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions