tree 29dc368e7eb5f0d84dacddaa51b4ff2288c3d258
parent 90267811dbb82be8b3f7a70af7f493ab7a9698b6
parent a6a28724002f61ad69d240192e3886be11a61693
author Nick Pelly <npelly@google.com> 1286479410 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286479410 -0700

am a6a28724: am 82d9bdb1: Merge "Don\'t enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread

Merge commit 'a6a28724002f61ad69d240192e3886be11a61693'

* commit 'a6a28724002f61ad69d240192e3886be11a61693':
  Don't enforce Authenticated Link key (MITM protection) on PBAP.