tree dfd31def6a69fabc757931cb700a3bdce88cb489
parent 0597100f9127ddc0b638eb044872f138f4d3e4a8
parent e08ae388d63c4db8f9d9a7ecd634f9a51f6e91b9
author Jeff Brown <jeffbrown@google.com> 1347141302 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347141302 -0700

Merge "Add new wifi display discovery API." into jb-mr1-dev