am 86bf0c7b: (-s ours) am 72a635a1: Merge "DO NOT MERGE Add additional options...
am 86bf0c7b: (-s ours) am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread
Merge commit '86bf0c7b'
* commit '86bf0c7b':
DO NOT MERGE Add additional options and receiver to BT tests