commit | 9e9760903dbb6918fd978e0b419d1ac4465d28c1 | [log] [tgz] |
---|---|---|
author | Jaikumar Ganesh <jaikumar@google.com> | Thu Oct 08 17:52:42 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 17:52:42 2009 -0700 |
tree | 26b7002d95725bba9b909d5b420835da9732e517 | |
parent | 978a95129323da61aaf2dc0d39302ae0cb043ba2 [diff] | |
parent | db99bb36449f34d6f26f61092a6c77de1bb98c91 [diff] |
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':