am 43bcbd87: am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale manual merge...

am 43bcbd87: am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread

* commit '43bcbd87':
  wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed