commit | be22605d1eacfb4137b6984b72a3eda004b911a1 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Mon Jun 03 15:44:16 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 03 15:44:17 2013 +0000 |
tree | 41425f86739f7cbd7b5902d48ef035d5ade74ea0 | |
parent | 05caa2a3de32e54562d1ec3031f73ef5392cfb40 [diff] | |
parent | d5f9fa574da2ee210ac86154ab0aea9fee5e8278 [diff] |
Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev