am 60f12730: am 0cf6951f: Merge "Bluetooth Security Test" into gingerbread

* commit '60f12730b08e2dba481c65a178c199625a7f3994':
  Bluetooth Security Test