Merge change Icb64cd2c into eclair-mr2

* changes:
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.

media/libstagefright/omx/OMXNodeInstance.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,8 @@ status_t OMXNodeInstance::freeNode() {
		mNodeID = NULL;

		LOGI("OMXNodeInstance going away.");
		delete this;
		mObserver.clear();
		// delete this; // leads to heap-corruption???

		return StatusFromOMXError(err);
		}