Meng Wang 587a5f9c7f resolve merge conflicts of 68b84f73 to master ...

Change-Id: If4d5647d199050846aaf250c4341657440dafb78

2016-09-28 21:06:55 -07:00

..

android/telephony

resolve merge conflicts of 68b84f73 to master

2016-09-28 21:06:55 -07:00

com/android

Added new config to indicate read-only apn types.

2016-09-19 18:56:12 +00:00