871e4ee81d
Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp * commit 'e84729002102622b40bd6efddffb76909615c12a': Prefer software decoders over hardware for thumbnail extraction.