diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-30 18:18:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 18:18:54 -0700 |
| commit | 31a40d0f6cb2e96e0c63cea8645991f67307ba5f (patch) | |
| tree | 067764d63bcc908c546f8302083ce36e5b2e3930 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 52b235b152ac1bbaf7f80402020d4ee7f5881f93 (diff) | |
| parent | 296e9b712b4de1eda5ade482f0d0672225b53f3a (diff) | |
am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp
* commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
Renaming SharedPreferences$Editor.startCommit to apply
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions