commit | c9ab5af9f2a811e2b6459b077092c29ca13b6f6d | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Fri Sep 25 18:09:20 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 18:09:20 2015 +0000 |
tree | 76b975eeb95551e6bd5fc3ee315d47efe7826ab5 | |
parent | 845b9dd8b54ead28f15032639acb834bdbc8baa5 [diff] | |
parent | 22e42b48f567390a76a1292b2b4f23782cb61c3b [diff] |
am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev * commit '8fafeb28797eb5ff96ebde62b1e7178ab56f29fe': CTS: verify ConnectivityManager.requestNetwork throws for restricted networks