| commit | b26fdd2d8073b3758b68c04c28923071d58e564a | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Aug 30 15:16:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 30 15:16:55 2012 -0700 |
| tree | 24a7a80a943e0fb2919723a5fa8d13aa1520ffa4 | |
| parent | b0dc8b57c7cc39a057170a0d1e5842bd866b1775 [diff] | |
| parent | 10ad9812b63c0ff8b37c7199595103533398a12b [diff] |
am 27a78751: am 5dcc2c98: Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev * commit '27a787512ff3f9a7ba200bc53f8c688692995748': Only run the wifi display RTSP server on demand, and only on the wifi direct