tree b55950b8f8dc73e4e8ac30cc7c7e19e6c135ffda
parent 10d6ff4485dc267f98b1f60fe13f79ed98b2c7b4
parent 82d9bdb117558939d975ca996522f881b0985a68
author Nick Pelly <npelly@google.com> 1286322984 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286322984 -0700

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

Merge commit '82d9bdb117558939d975ca996522f881b0985a68' into gingerbread-plus-aosp

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