am 6ccc515c: Merge change I8385f59d into eclair

Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp

* commit '6ccc515c7f705a66718d0138a421e29186667b9e':
  sdk doc change for esr: Cleanup for resources tab content.