tree f7abe461abbfad997f5bda7100d9dec043ece7c2
parent 4b6b4827b6c7825a3b18f9051c262d3c94acb1e8
parent 76965ca62f7b54ca277f06a597373439cc87c311
author Jaikumar Ganesh <jaikumar@google.com> 1284403939 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284403939 -0700

am 76965ca6: Out Of Band API for Secure Simple Pairing.

Merge commit '76965ca62f7b54ca277f06a597373439cc87c311' into gingerbread-plus-aosp

* commit '76965ca62f7b54ca277f06a597373439cc87c311':
  Out Of Band API for Secure Simple Pairing.