Amit Mahajan d7a1242241 resolved conflicts for merge of 28a8cf68 to mnc-vt-dev ...

Change-Id: I094220b4d61914d0774bc62f1065e2a1c85f4000

2015-06-15 15:54:29 -07:00

..

android/telephony

resolved conflicts for merge of 28a8cf68 to mnc-vt-dev

2015-06-15 15:54:29 -07:00

com/android

am ecadb92e: Merge "Read MMS config from CarrierConfigManager." into mnc-dev

2015-06-12 04:51:21 +00:00