Sanket Padawe a255d5de80 Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev ...

am: 1a6b6fc266

* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4

2016-06-03 00:44:49 +00:00

..

android/telephony

Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev

2016-06-03 00:44:49 +00:00

com/android

Merge "Add restricted card state to telephony manager." into nyc-mr1-dev

2016-05-25 21:39:12 +00:00