Conley Owens 981db85bf2 am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." ...

* commit '737b5c58c9094e5759bd4162f23f73be2b71faaf':
  Fixing wrong Japanese phone formatter.

2011-05-02 10:11:56 -07:00

..

java

am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."

2011-05-02 10:11:56 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00

tests

Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.

2011-03-14 12:39:01 -07:00