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 | e28776bbd72397eea0dd24f5c28273fb2bf1a2f0 (patch) | |
| tree | b89399e174fa0d02011f98def0cb612d8c1dcc0b /opengl/java/android/opengl/Texture.java | |
| parent | 5a9cbb291fa7505a6c51eba6f600009dfc17366d (diff) | |
| parent | b1110149cccc3b99e59ead34ca46e5ac026f6db9 (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions