am 0c072553: am a92896f6: Merge "Fix a mediaserver crash caused by...
am 0c072553: am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
* commit '0c072553':
Fix a mediaserver crash caused by dereferencing a NULL pointer.