Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp
* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
Fix 2797185: Re-enable thumbnail generation in framework
Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp
* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
Fix 2797185: Re-enable thumbnail generation in framework