diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-30 18:25:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 18:25:02 -0700 |
| commit | 160ccc36b258eb675624c67ee9ff2a939a396e46 (patch) | |
| tree | 3da1d8d0a16d08bae8a68c1b9a23cd5a4a40992c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a8b6129f0c1fb1450aeb70eff681c7ef0e9a5f9e (diff) | |
| parent | 31a40d0f6cb2e96e0c63cea8645991f67307ba5f (diff) | |
am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'
* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
Renaming SharedPreferences$Editor.startCommit to apply
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions