| commit | 4a02d4c60946c257ab48783493db67ca08e327bc | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Jun 03 08:48:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 08:48:30 2013 -0700 |
| tree | c98c79c04625a9e6f669a4d643f2e9c326a4b4bc | |
| parent | 293665686e45ae7c969a51de9fe9c9b32604782f [diff] | |
| parent | c41a0eff938f825ef235b92efa7a31c3b7f8bfb4 [diff] |
am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev * commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4': Listen for HTTP proxy changes and propagate the information to the media