am f6df5b41: (-s ours) am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

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