tree c90752ff94f325e1008a2a7bc83a6d60dab893e3
parent dd44d8da9f05e3e38a618dc27e354939337d3624
parent 7dc550597f490a67c8d020c727bfbf2d9d212d42
author Jaikumar Ganesh <jaikumar@google.com> 1287520642 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287520642 -0700

am 7dc55059: Add Parrot car kit (KML_CAN) to the auto pairing blacklist.

Merge commit '7dc550597f490a67c8d020c727bfbf2d9d212d42'

* commit '7dc550597f490a67c8d020c727bfbf2d9d212d42':
  Add Parrot car kit (KML_CAN) to the auto pairing blacklist.