The Android Open Source Project 1f35de2a2e am 79090cb3: merge from open-source master ...

Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken

* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
  Change license for the UUS Information file.
  Remove ProximityAlerts Receiver when last ProximityAlert expires.

2010-05-12 15:06:13 -07:00

..

java

merge from open-source master

2010-05-12 14:54:38 -07:00

tests/telephonytests

Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java

2010-04-30 10:59:37 -07:00