tree dc48bbe6fdeae60c041909abd97b31d7cc373292
parent 25c925e6659e57f1cc8fef83be07f3917a108e3c
parent 21c7153d30071dcbeb92daa1fd48ed181e42aef3
author Jeff Brown <jeffbrown@google.com> 1347222559 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347222559 -0700

Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev