Merge "Clean up A2DP State Machine"
tree: 80184faef49d7ae7076c46c38fa77a1a133c232b
  1. android/