diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-13 14:56:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-13 14:56:02 -0700 |
| commit | c35b71b38ad1ff80058ec8d01d441de9f31a0742 (patch) | |
| tree | a13d48546e925a991a65ce55ecbe7cecdb4d8ad2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 99857146561ea16fca840d92e73325509cf7894c (diff) | |
| parent | 7541e1e1d64aca2af62ba642d98873711e9d199b (diff) | |
am b1110149: merge from open-source master
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken
* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
Use integer for loop counter instead of float
New test in FrameworkTest for the VelocityTracker class
Preserve '+' in phone numbers imported from SIM.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions