diff options
| author | Dave Sparks <davidsparks@android.com> | 2010-04-02 09:11:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:11:56 -0700 |
| commit | 26e4b29206c8e6f855134fdb607583174d16afa1 (patch) | |
| tree | 7a13d65bca39938309b90f95dfb57f45aedfe844 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f1324c71f734470d347243dac2b15837c0319ad9 (diff) | |
| parent | 8421672e2e883e0cdda00f22e4f0e8c1053312ad (diff) | |
am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo
Merge commit 'd9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp
* commit 'd9c16c37ea28933973f32cb434f770226266b675':
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