tree 72f71f6e6c6877b6730d7819ea1e5d5d45d39eee
parent 0102f6915a235fc4c4840d424ca52ff62ed0fd4c
parent d691679bdcd234bd908aea8c378e214e90d6eeb5
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