summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-01-12 15:35:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-12 15:35:17 -0800
commitebccf76cebe40667f9fc6d1317a6ae010dc82735 (patch)
tree43a10dd1809c46c1a4ddffad6a4120b018651eec
parent8647e1ad4dbd9a7398d5ccbefeb9810c70524dbc (diff)
parentcf97dff7e5d6ed4d80be0f468a43c2360836d439 (diff)
downloadframeworks_av-ebccf76cebe40667f9fc6d1317a6ae010dc82735.zip
frameworks_av-ebccf76cebe40667f9fc6d1317a6ae010dc82735.tar.gz
frameworks_av-ebccf76cebe40667f9fc6d1317a6ae010dc82735.tar.bz2
am 4fbf60e7: (-s ours) 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 '4fbf60e724ec6aff3ec8d78a5fdb284e98c914cb': Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
0 files changed, 0 insertions, 0 deletions