| commit | 2ce22dd5000248090917fc5ead206603c2ae3e4a | [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 | 1bbd7530edf9c506311c125a375d7ec8586fdb5f [diff] | |
| parent | a69f1b06de333a97a99c317d72357f1f2373c636 [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