tree 41d9eb2a882d362fd5663009e10068ff28d24ba8
parent 7a218d7a3ad7f8aab1f28f8b72154204e16d73ec
parent 858caeaaa1db4076565e6df06b2b2721ec453c4e
author Mike Lockwood <lockwood@android.com> 1289934963 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1289934963 -0800

Merge "MediaScanner:  Always use mime type provided to the media scanner"