am 60d10ec9: (-s ours) Merge from gingerbread - do not merge

* commit '60d10ec91aa9de6b4699a87557ba8f041bf34be3':
  Port RIL v4 to gingerbread from master.