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

Merge commit '86bf0c7b69856124feb41fb1a938dce1f6695949'

* commit '86bf0c7b69856124feb41fb1a938dce1f6695949':
  DO NOT MERGE Add additional options and receiver to BT tests
tree: 01d1359a3be31beb124000693824974d0390b309
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE