Katie McCormick 360e40ef21 am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-10 13:03:27 -08:00
..
2010-10-25 15:42:03 -07:00