| commit | c5976600f8728766d152389a05ab2f701b9392f5 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Apr 11 14:16:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 14:16:28 2013 -0700 |
| tree | 0bfa5896ff4e3426dc82cfb689776b40c1ea350c | |
| parent | c680df2b0b8fbc8b5c42ac8e6ed7673ec57ec5b0 [diff] | |
| parent | aa4677cfa0070f04ebddc76b9eaba44203634d84 [diff] |
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev * commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a': Use CONNECTIVITY_INTERNAL for global proxy