diff options
| author | Dave Sparks <davidsparks@android.com> | 2010-04-02 09:16:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:16:02 -0700 |
| commit | 9d4692877593c573f4456bad27a20a0647feff1a (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 68cec9661c7cb8c16bda647012a342cebbfdfdbb (diff) | |
| parent | 26e4b29206c8e6f855134fdb607583174d16afa1 (diff) | |
am 6c8770df: am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo
Merge commit '6c8770df939782d767fdf2cdb68c4a289015a5e6' into kraken
* commit '6c8770df939782d767fdf2cdb68c4a289015a5e6':
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions