am 7585586c: Merge change Ib1eb2e9e into eclair

Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp

* commit '7585586ce5b5de699b95125672e29eaf70876727':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.