am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout...
am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit 'c8410017':
Remove discoverable timeout handler. DO NOT MERGE