| commit | 5dcc2c988eefba1049fe64172bc5fc7e6ee27c8b | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Aug 30 15:12:29 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 30 15:12:30 2012 -0700 |
| tree | 843fcb9a1f79415d00cec48213dbf75b69b73e7a | |
| parent | b9cba9b731195d4387ee21b7e9ba1137a3cfda68 [diff] | |
| parent | bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9 [diff] |
Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev