am 23b2d523: am 56b20860: Merge change 26349 into eclair

Merge commit '23b2d523bda3db39f272aa644673d799837b7a46'

* commit '23b2d523bda3db39f272aa644673d799837b7a46':
  Fix issue 2116700: Ringer screwy while connected over Bluetooth.