am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods....
am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo
Merge commit 'd9c16c37' into froyo-plus-aosp
* commit 'd9c16c37':
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.