Merge "Add metadata in direct display surface to support ANativeWindow use cases...

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

Thu, 3 Aug 2017 20:54:34 +0000 (20:54 +0000)

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

Thu, 3 Aug 2017 20:54:34 +0000 (20:54 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 3 Aug 2017 20:54:34 +0000 (20:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 3 Aug 2017 20:54:34 +0000 (20:54 +0000)
diff --cc libs/vr/libvrflinger/display_surface.cpp
Simple merge
diff --cc libs/vr/libvrflinger/display_surface.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 3 Aug 2017 20:54:34 +0000 (20:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 3 Aug 2017 20:54:34 +0000 (20:54 +0000)
		1	2
libs/vr/libvrflinger/display_surface.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/vr/libvrflinger/display_surface.h	patch \|	diff1 \|	diff2 \|	blob \| history