DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: 6301f88251 am...

author Robert Shih <robertshih@google.com>

Thu, 25 May 2017 21:32:24 +0000 (21:32 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 25 May 2017 21:32:24 +0000 (21:32 +0000)
author Robert Shih <robertshih@google.com>
Thu, 25 May 2017 21:32:24 +0000 (21:32 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 21:32:24 +0000 (21:32 +0000)
diff --cc media/libstagefright/omx/GraphicBufferSource.cpp
Simple merge
diff --cc media/libstagefright/omx/OMXNodeInstance.cpp
Simple merge
author	Robert Shih <robertshih@google.com>
	Thu, 25 May 2017 21:32:24 +0000 (21:32 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 25 May 2017 21:32:24 +0000 (21:32 +0000)
		1	2
media/libstagefright/omx/GraphicBufferSource.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/omx/OMXNodeInstance.cpp	patch \|	diff1 \|	diff2 \|	blob \| history