| commit | 61b00239dda1d0c5e7c34e88ad9f56817543d0b8 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Nov 29 14:26:04 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 14:26:04 2012 -0800 |
| tree | dda39f4b499345e62b8e24e820707783f7db18b0 | |
| parent | 52c3833e20d0e78fcb367c1e81cd2c83f9165a0a [diff] | |
| parent | 0cec3de3374a861497ff7eeada94865e85896971 [diff] |
am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev * commit '0cec3de3374a861497ff7eeada94865e85896971': WFD: Fallback to PIN mode if PBC is not supported