Merge "Add support for preset ANW buffer mode" into oc-mr1-dev

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

Thu, 21 Sep 2017 00:59:59 +0000 (00:59 +0000)

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

Thu, 21 Sep 2017 00:59:59 +0000 (00:59 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 21 Sep 2017 00:59:59 +0000 (00:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 21 Sep 2017 00:59:59 +0000 (00:59 +0000)
diff --cc media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 21 Sep 2017 00:59:59 +0000 (00:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 21 Sep 2017 00:59:59 +0000 (00:59 +0000)