diff options
author | Fred Quintana <fredq@google.com> | 2009-12-17 13:21:36 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 13:21:36 -0800 |
commit | eb038db53ae72da6df2045a0f5b084bcba3e874d (patch) | |
tree | 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa /opengl/tests/gl_basic/gl_basic.cpp | |
parent | bc9c96c5ec12b041767bd1a3401bd04fb6f2fcea (diff) | |
parent | 86e376908a563046f5fb6b52aed390763370e3f3 (diff) |
am bc1c8847: am 66cc5900: Merge change Ic70239e8 into eclair-mr2
Merge commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0'
* commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0':
changed SettingsProvider to manage the androidid itself
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions