tree 463b923afa89f3be30805dec2ca9442a611f1307
parent 86ec737dd4f7dad5f2a8863a8e1e2ee20bbd03b3
parent 89b72c3645fc2ec981e08de4a3e07f12ef0e425b
author Andreas Huber <andih@google.com> 1347322500 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347322500 -0700

am 89b72c36: am 66765846: Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev

* commit '89b72c3645fc2ec981e08de4a3e07f12ef0e425b':
  Enable audio streaming to a wifi display. Remove startup delay hack.