6f3cbac7eb
Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9' * commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9': Document the media scanner's flow through native and java code, since