Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp * commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9': When encountering a .nomedia file, notify the MediaScannerClient,