am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

Browse Source

* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
  Bluetooth: correcting return value from cancelDiscovery

...

This commit is contained in:

Jaikumar Ganesh

2011-07-14 10:55:55 -07:00

committed by Android Git Automerger

parent 726492eae9 6dd4531639

commit 8c1703015e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available