| commit | a5cbecbc7f940902b966f12a1e4c74d43dc562e4 | [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 | a700b4c9973e2edb77ba6c95fc1b3884cf833127 | |
| parent | f351faed1f54aac8a06b6685dc77a7764d7cf543 [diff] | |
| parent | ab1bd84889273bc21efdabe5ff6f4633eb918a85 [diff] |
Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev