am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp

Browse Source

* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API

...

This commit is contained in:

Katie McCormick 2011-02-10 13:03:27 -08:00 committed by Android Git Automerger

parent 00c662cbdf b91f20af98

commit 8952156b4b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available