Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: 572cb5242d

author Romain Guy <romainguy@google.com>

Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)

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

Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)
author Romain Guy <romainguy@google.com>
Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Romain Guy <romainguy@google.com>
	Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 22 Jul 2017 03:14:31 +0000 (03:14 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history