tree 29b42bfa8737ff7daa3d0216a47344519a18c37c
parent d44e1b6033eed29718f2e7e3540e4884929941a5
parent af16d0b30e89f31b7617424c8706553ff571d08d
author Mike Lockwood <lockwood@android.com> 1310411721 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310411721 -0700

Merge "Remove unnecessary locking from MediaScanner JNI code"