tree b55950b8f8dc73e4e8ac30cc7c7e19e6c135ffda
parent 0ca9e88b03dd34a1bbf63a218d34a7449ff2635b
parent 4fbc7412b96934831ce29a7af54b170056f8c2de
author Nick Pelly <npelly@google.com> 1286322803 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286322803 -0700

Merge "Don't enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread