tree ffe81460ca6a2f255d7cb6fe93a79fb0b081a72a
parent faed98a161f58441ebce3dcb08cd8bf76a76da4e
parent 59c53c6224e2f84d31a56854ebe90d22055100d2
author Jeff Brown <jeffbrown@google.com> 1347396964 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347396964 -0700

Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev

* changes:
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.