diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-13 11:54:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 11:54:04 -0700 |
| commit | ef18fda57189a2e0fdbfde8e7548a6a5120bb841 (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6feb51a62989c1ca0b207cebe0c672ead34390c0 (diff) | |
| parent | 762e0ff7ebfa478a100d7be26aefaa270b4bd7a2 (diff) | |
am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken
* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
Fix an upgrade bug in SettingsProvider.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions