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