Sanket Padawe 701cd3fe15 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev ...

am: b68601d247

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

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431

2016-06-02 23:15:57 +00:00

..

android/telephony

Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev

2016-06-02 23:15:57 +00:00

com/android

Merge "OMADM intent sent by both system and apps." into nyc-dev

2016-05-17 17:41:11 +00:00