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