Merge "Setting queue metadata size via dvrSurface API"

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

Sat, 3 Jun 2017 02:34:30 +0000 (02:34 +0000)

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

Sat, 3 Jun 2017 02:34:31 +0000 (02:34 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 3 Jun 2017 02:34:30 +0000 (02:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 3 Jun 2017 02:34:31 +0000 (02:34 +0000)
diff --cc libs/vr/libdvr/dvr_surface.cpp
Simple merge
diff --cc libs/vr/libdvr/include/dvr/dvr_api.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 3 Jun 2017 02:34:30 +0000 (02:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 3 Jun 2017 02:34:31 +0000 (02:34 +0000)
		1	2
libs/vr/libdvr/dvr_surface.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/vr/libdvr/include/dvr/dvr_api.h	patch \|	diff1 \|	diff2 \|	blob \| history