Commits
Jaikumar Ganesh authored and Android Git Automerger committed 8c1703015eeM
am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp * commit '6dd4531639157191e6224d3f8af5c9d099ca945f': Bluetooth: correcting return value from cancelDiscovery
Showing diff to726492eae99