commit | c13ab2f3961150c5645af84bf2590a03df3dbc2b | [log] [tgz] |
---|---|---|
author | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 09:36:59 2015 -0800 |
committer | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 09:36:59 2015 -0800 |
tree | e9a8c6b141d58200721bd70225b8726afb337b85 | |
parent | faf47382295d838adb6158bd0ca1e83a0902a202 [diff] | |
parent | 23a604e1c936ee39fd26a9475681e38519d71fa8 [diff] |
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