Wink Saville e34a7686a3 am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE ...

* commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47':
  Remove SIM operator name hack

2011-05-17 20:38:05 -07:00

..

java

am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE

2011-05-17 20:38:05 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

2011-05-10 15:52:15 -07:00