tree ac81416dd005878288cbcf5f9b454fa99c33aa08
parent cef27ee7dc147018196577eaa4e7293f09c37ab1
parent 4a2d630f686c44fb2a77c90bc6cf87779725abe2
author Dirk Dougherty <ddougherty@google.com> 1260988340 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260988340 -0800

am 4a2d630f: am 6ccc515c: Merge change I8385f59d into eclair

Merge commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2'

* commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2':
  sdk doc change for esr: Cleanup for resources tab content.