| commit | d3b63c0ec3b706eb8a802f253285e31954eadf6f | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Tue Oct 13 12:04:36 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 12:04:36 2009 -0700 |
| tree | fbfa7bdd8ab3971e640c40c5fd0c55cf78ae31f6 | |
| parent | 0c8848e273a1949e171fca4db013393bbebb3b09 [diff] | |
| parent | 9e9760903dbb6918fd978e0b419d1ac4465d28c1 [diff] |
am 9e976090: am db99bb36: am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly. Merge commit '9e9760903dbb6918fd978e0b419d1ac4465d28c1' * commit '9e9760903dbb6918fd978e0b419d1ac4465d28c1':