am b7da7dd0: Merge change 25870 into eclair

Merge commit 'b7da7dd0a3c9db59854d2ef01b3fe7b999ec14c2' into eclair-plus-aosp

* commit 'b7da7dd0a3c9db59854d2ef01b3fe7b999ec14c2':
  Add ring back tone notification.