Android 2.1 release 1
Merge change Ie8650e4b into eclair

* changes:
  sdk doc change for esr: fix some broken links to resources files.