diff options
author | Fred Quintana <fredq@google.com> | 2009-12-17 12:21:25 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 12:21:25 -0800 |
commit | 86e376908a563046f5fb6b52aed390763370e3f3 (patch) | |
tree | 935174efb7ab3e6f273573cf96df95f2f7ebb9dc /opengl/tests/gl_basic/gl_basic.cpp | |
parent | c59fde9dcbd595f8b5580446b85801f0ccd8e8b5 (diff) | |
parent | 02a5abc3628afdda94d9a53973c4ae5f34d37e1d (diff) |
am 66cc5900: Merge change Ic70239e8 into eclair-mr2
Merge commit '66cc5900a53b22326bce053973730a301732efe9' into eclair-mr2-plus-aosp
* commit '66cc5900a53b22326bce053973730a301732efe9':
changed SettingsProvider to manage the androidid itself
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions