tree 8ae19d56b416a17a218c4c405939acad3fe8cb1e
parent f45002335606a9edb181814fbdf8d0a4e1468a9d
parent d8ee4e56f92eeb44ddc0997efe280b9f28ad814d
author Andreas Huber <andih@google.com> 1346279523 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346279523 -0700

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

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