am efd938f7: (-s ours) am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread

Merge commit 'efd938f77a315b977031f10e526609e6c7cd7e14'

* commit 'efd938f77a315b977031f10e526609e6c7cd7e14':
  Add register methods in CallManager "do not merge"