commit | 2188caf172e9e190688687ce8ab8b6b136fc9e19 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Tue Jan 25 16:16:32 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 16:16:32 2011 -0800 |
tree | c46dc2e8e98852d6090b08618a96efe805e80c2a | |
parent | 01a2868985bdb1a756b0dc3c2c6f6cde10c05c72 [diff] | |
parent | 13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27 [diff] |
am 13d1cb56: (-s ours) 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 '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27': Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge