| commit | cf97dff7e5d6ed4d80be0f468a43c2360836d439 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Jan 12 15:31:01 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 12 15:31:01 2011 -0800 |
| tree | 8227d7736ee78d8901b41b462ae398ec607a1679 | |
| parent | 20df25aae1a065d3671d8d6d9d5d81836054de7b [diff] | |
| parent | 7b8a803497450bb90b9c4f5ba3426bf984fad274 [diff] |
am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread * commit '0569e58988bae5f08733e21e8d8adfa61fe89b7f': Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge