tree e9a8c6b141d58200721bd70225b8726afb337b85
parent faf47382295d838adb6158bd0ca1e83a0902a202
parent 23a604e1c936ee39fd26a9475681e38519d71fa8
author Divya Sharma <c_shard@codeaurora.org> 1446658619 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658619 -0800
mergetag object 23a604e1c936ee39fd26a9475681e38519d71fa8
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052357 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgUACgkQ6K0/gZqxDnikyQCgg3HxhuueVhI2EU5tiFJX5mxA
 k3gAn1V+o780jxYBLJ/ib7xLtTi2GPBf
 =qPPM
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Catch exception for ConnectivityManager.unregisterNetworkCallback
  Default MMS proxy port to 80 and don't skip if port is invalid
  MMS proxy host dns lookup should happen on mms network

Change-Id: I92a2b7e802fab7dc94fd6bca01ecd5bfbb31f9d0