Jean-Baptiste Queru 7372505e2f am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode" ...

* commit '6c50da75f696c184590c6e27d25755ee428f2afc':
  Fix Force Close when enable airplane mode

2012-06-11 11:22:15 -07:00

..

java

am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode"

2012-06-11 11:22:15 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

DO NOT MERGE: Remove SMS shortcode warning feature.

2012-06-05 12:21:02 -07:00