am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying to...
am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '65d39eeb':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.