diff options
| author | Roy West <rwest@google.com> | 2010-09-29 22:12:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 22:12:19 -0700 |
| commit | 3382fbfea44baddf0a4dd792e7c81c1cb3355a79 (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7dc969e8b974ba1806726a0e73d3a17d926fe2ad (diff) | |
| parent | fb46cd118bc2ac7c784ab653cdb38c5912dea0d5 (diff) | |
am b4a28f24: (-s ours) am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
Merge commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f'
* commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f':
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