OSDN Git Service

Merge changes from topic 'merge_remaining_car_dev'
authorSanket Agarwal <sanketa@google.com>
Fri, 28 Oct 2016 20:51:27 +0000 (20:51 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 28 Oct 2016 20:51:28 +0000 (20:51 +0000)
commitd4be1bd1fd36f9f0c8f412484217a923d854351f
tree2c71f546ff26eb1569725ac250131d04329cae4b
parent2213c5d47da915eca60449c959c3c98164deae9f
parentb2c3dc95628314b060cef05d59ce2fe4ef747b84
Merge changes from topic 'merge_remaining_car_dev'

* changes:
  PBAP over L2CAP
  Unset the priorities for car profiles on unpair.
  HFP should timeout in Java services if Native never replied
  HF should wait for AG to change conference
  Conference calling via HFP
  Improve connection handling logic in ConnService