Wink Saville 5a84de6ee6 resolved conflicts for merge of 74af525e to master ...

Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d

2011-05-13 14:01:16 -07:00

..

android/telephony

am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE

2011-05-13 09:20:08 -07:00

com/android/internal/telephony

resolved conflicts for merge of 74af525e to master

2011-05-13 14:01:16 -07:00