tree 65998d03408ad7710e2e9b150fe9202b224a3c9b
parent e0c87269b94e5b24de8e9577ba32070b24e83582
parent 27a787512ff3f9a7ba200bc53f8c688692995748
author Andreas Huber <andih@google.com> 1346365015 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346365015 -0700

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