Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp * commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120': OutOfband pairing user dialog.
Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp * commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120': OutOfband pairing user dialog.