tree 781dd2c9564631b9df3cf75a027aa3e1da457f08
parent 55d80586c76580bf6cbc00e9bd89658a72aa985b
parent 1d15167865b22730cf6ba314a057e62f960aa1db
author Dirk Dougherty <ddougherty@google.com> 1260933985 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260933985 -0800

am 1d151678: Merge change Ie8650e4b into eclair

Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp

* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
  sdk doc change for esr: fix some broken links to resources files.