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