am f5cae7d1: (-s ours) am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread

Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'

* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
tree: 11ab336c37c0f62ee9e73d210f7a267cc140687f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE