tree 5ef0a406c44d5cfe8c9c8cabdbb4bd04a9d91cbb
parent 4872c0ab62561ac90bb7a47880e59b7f2e699a38
parent 544b67a04b4289aaafa852cbab54abf1f3d6a5bf
author Andreas Huber <andih@google.com> 1346279651 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346279651 -0700

am 544b67a0: am d8ee4e56: Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev

* commit '544b67a04b4289aaafa852cbab54abf1f3d6a5bf':
  Initial checkin of support for acting as a wifi display source