diff options
| author | Gilles Debunne <debunne@google.com> | 2010-10-05 17:02:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 17:02:27 -0700 |
| commit | 7a2351cd9e732e4b021809ab8ced367b64a58055 (patch) | |
| tree | 23ab7192240ccf62860daebe37cb7ae7565705d4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 096bd77bb4606986341e2390b1d63261c6d66afe (diff) | |
| parent | 64e8d24969f0d3c717b56776e23ee6dad794c56c (diff) | |
am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'
* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
Restored ic_dialog_menu_generic asset.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions