Robert Greenwalt 8cdfd60d27 am 15319ded: am 460abe97: Merge "Add support for Caller Name Display" ...

* commit '15319ded1545dbb266273439063caf6ca23629f5':
  Add support for Caller Name Display

2012-06-12 15:58:10 -07:00

..

java

am 15319ded: am 460abe97: Merge "Add support for Caller Name Display"

2012-06-12 15:58:10 -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