qingxi bd012f68ac Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev ...

am: 130db7715a

Change-Id: I130ba1362d755e1859d5c22311867008d0626890

2016-06-14 17:15:41 +00:00

..

android/telephony

Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev

2016-06-14 17:15:41 +00:00

com/android

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

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