tree 7a0e4d3ed299e7af38636df74d2531d7fbf395b2
parent 76abb934155519e40cfb3b500fefe37b57376993
parent 45c9fa94b80dea42d95e12df0868738ba386098b
author Anthony Lee <anthonylee@google.com> 1435862930 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435862930 +0000

am 45c9fa94: Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev

* commit '45c9fa94b80dea42d95e12df0868738ba386098b':
  Update BluetoothPhoneServiceImpl to handle childless conference calls.