am d874afb8: Merge change I218bca82 into eclair-mr2

Merge commit 'd874afb84dd3933cb859df6ca10689982720765b' into eclair-mr2-plus-aosp

* commit 'd874afb84dd3933cb859df6ca10689982720765b':
  Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.