Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp * commit '287952c35e148811c106bc0f5036eabf20f71562': Fix issue #3022508: Crash during media scan
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp * commit '287952c35e148811c106bc0f5036eabf20f71562': Fix issue #3022508: Crash during media scan