Merge "bug fix: fix encoder input port configuration issues" into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Sat, 10 Jun 2017 01:23:28 +0000 (01:23 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 10 Jun 2017 01:23:30 +0000 (01:23 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 10 Jun 2017 01:23:28 +0000 (01:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 10 Jun 2017 01:23:30 +0000 (01:23 +0000)
diff --cc media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
Simple merge
diff --cc media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 10 Jun 2017 01:23:28 +0000 (01:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 10 Jun 2017 01:23:30 +0000 (01:23 +0000)
		1	2
media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp	patch \|	diff1 \|	diff2 \|	blob \| history