tree 6817db5f741ce08f0beaaa0bef831a96468e2786
parent f8e6a30ab98c544c1a5695455187ea7743dd1f40
parent 5d082f1826cd5b72cd2a0eb0116c8a613d7555dd
author Matthew Xie <mattx@google.com> 1394563922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394563922 +0000

am 5d082f18: Merge "Fix PAN control callback definition to match what bluedroid is doing."

* commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd':
  Fix PAN control callback definition to match what bluedroid is doing.