tree 7f4b0d4c29b9f4fe9515f9de7730bce852d149fd
parent 1285e5143a75a39441bafad84ca5f63dc40c570b
parent 60f12730b08e2dba481c65a178c199625a7f3994
author Brian Muramatsu <btmura@google.com> 1316044351 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316044351 -0700

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

* commit '60f12730b08e2dba481c65a178c199625a7f3994':
  Bluetooth Security Test