commit | 49e9a5c2c2037f570d036e270dfef4b8f28e7d3f | [log] [tgz] |
---|---|---|
author | Dave Sparks <davidsparks@android.com> | Fri Jan 21 17:37:34 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 21 17:37:34 2011 -0800 |
tree | 53d7d3ad694f734aa688509c20d288fa7416e932 | |
parent | 3950125472675b07f220d7f91df5a2d7b1489836 [diff] | |
parent | e717633851ea07c2c7581dfba4915bbe27d9640a [diff] |
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.