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.
Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory
bug: 2644009
Change-Id: I1ecc09312f404e00bbf30befffb1811efe578cc3
This makes properties easier to read so from:
ro.cdma.data_retry_config=default_randomization=2000,0,0,120000,180000
to this:
ro.cdma.data_retry_config="default_randomization=2000,0,0,120000,180000"
Change-Id: Ied2a7be0102512cd2ce528d566c19ed3a8e2f480
Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java