| commit | 8c1703015eecb51c77f78b7073bcacd83f1cda56 | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Thu Jul 14 10:55:55 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 14 10:55:55 2011 -0700 |
| tree | 73be9629ec0c55f905225f5d187896a250c58357 | |
| parent | 726492eae99f8aa8b46eca45e45c9e7f6e7b8b45 [diff] | |
| parent | 6dd4531639157191e6224d3f8af5c9d099ca945f [diff] |
am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp * commit '6dd4531639157191e6224d3f8af5c9d099ca945f': Bluetooth: correcting return value from cancelDiscovery