OSDN Git Service

Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
authorIrfan Sheriff <isheriff@google.com>
Thu, 29 Nov 2012 00:28:40 +0000 (16:28 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Nov 2012 00:28:41 +0000 (16:28 -0800)

Trivial merge