am db99bb36: am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.

Merge commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91' into eclair-mr2-plus-aosp

* commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91':