diff options
| author | Roy West <rwest@google.com> | 2010-09-29 10:40:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 10:40:06 -0700 |
| commit | fb46cd118bc2ac7c784ab653cdb38c5912dea0d5 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c3bc834a00ab6eca6fab4ce048e9dfddc66f8671 (diff) | |
| parent | 89f7cfa16e35ecbd4272cc7d07f4860de3536812 (diff) | |
am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp
* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
Partial fix to bug 2992589: Edit dev admin strings.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions