tree e0d09b481fbbffbe80c550a2bfc39dd11095db8d
parent 021b23b336f4616a8f91dce62acb2809dfcadf15
parent afdacb6b56cb407fe7dd887341369fffb0a0be7d
author David Ng <dave@codeaurora.org> 1449709492 -0800
committer David Ng <dave@codeaurora.org> 1449709492 -0800
mergetag object afdacb6b56cb407fe7dd887341369fffb0a0be7d
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526276 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAQACgkQ6K0/gZqxDnhR2wCfXfrcVbA9Rh7n/o95X2+d4EuB
 qK4AnjjDEqlfdhnDBvQvDX3HLVBPVjnk
 =4gs6
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf
  Updating MTS Canada APN config (302-660)
  Fix APN configs for SoftBank JP (MCCMNC=44020) per their request. This issue was reported on Shamu with mnc-release, but we couldn't fix it before M OTA because of schedule issue.
  Change to add user_visible field to Carriers table.

Change-Id: Ic58a046cb68dd9bcb380c63b215072416c4ba7ea