tree 1d8468ff61a673100c383ee5cd58d8c4b3945d35
parent 863ee40964ef2a017a1116abe37c6b8ad466dd5e
parent fb6232635d339c83ca100e472b159f103dafb6e2
author Mike Lockwood <lockwood@android.com> 1304524657 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304524657 -0700

am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider