am f29fbc58: merge from froyo-plus-aosp

Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c'

* commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c':
  Change in media scanner to set correct date
This commit is contained in:
The Android Open Source Project 2010-06-25 14:22:01 -07:00 committed by Android Git Automerger
commit e2e4727ac5

Diff Content Not Available