tree 5673f3b21d367dc4efd6afade038c018b4efd83b
parent 5262df1fd48ed6c4a350124a6319d664e838a8a6
parent dc91c885f267005e06f439a3bd592b3d8706bb50
author Andreas Huber <andih@google.com> 1346427399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346427399 -0700

am dc91c885: Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." into jb-mr1-dev

* commit 'dc91c885f267005e06f439a3bd592b3d8706bb50':
  Implement the source->sink(!) keep alive the wfd specs mandate...