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.
This commit is contained in:
The Android Open Source Project 2010-05-13 14:56:02 -07:00 committed by Android Git Automerger
commit c35b71b38a

Diff Content Not Available