diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-22 13:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 13:25:14 -0700 |
| commit | a5786f8023065904b16512748078dbecf31926cb (patch) | |
| tree | 0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 85b87cf5a142f916391ccad01b6a222fd120d259 (diff) | |
| parent | 315583c8346c40c0a7aa73e3566295fd5a37ea81 (diff) | |
am 5ebaf106: merge from open-source master
Merge commit '5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken
* commit '5ebaf10693725c9dc48219c3c65945b84d74692f':
Fix broken logic in SettingsProvider.parseProviderList.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions