Merge "Use intdef annotations from BluetoothA2dp.java"