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.
tree: 7d5330152c49ca35fd3948d913acff0edebb6230
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE