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 '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
tree: 74e28c69edf407830c632b5a1dd2e8fc7344b416
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/