Jake Hamby 7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp ...

Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2

2011-06-07 15:01:50 -07:00

..

java

resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

2011-06-07 15:01:50 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."

2011-06-06 11:33:52 -07:00