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

* commit '817ddaf979d66858e02444ae3ff3dfe02dea288e':
  DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
tree: 53d7d3ad694f734aa688509c20d288fa7416e932
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/