| commit | 4c6caa517238f0615bac6b4aba035440ba4e4b78 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Oct 10 16:05:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 16:05:48 2013 -0700 |
| tree | 237b6eb718e3c6e4273162fd625a25866ac7bf95 | |
| parent | cf9596ddee1c6040f79f77e0ca8ae875ded5a0e9 [diff] | |
| parent | 445cea83712528ac08d34adb654592b2944bd5fe [diff] |
am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev * commit '6b57033b022890242d6833b494040c360af691d0': getProxy in ConnectivityService returns port w/PAC