| commit | 6f9ff5d2260e174f5f3b809b396e4971d35a94d2 | [log] [tgz] |
|---|---|---|
| author | Dave Sparks <davidsparks@android.com> | Fri Apr 02 09:28:46 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 02 09:28:46 2010 -0700 |
| tree | 8a0fef786d4926bc82c2e64efd39ed5f309051a4 | |
| parent | c2af3df89b5c8a6971ba536a5fb0cd55920c49c4 [diff] | |
| parent | 4cd79e3c5ca17f2c45dde0938f8208c87eeee943 [diff] |
am 4cd79e3c: am 6c8770df: am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo