Merge "Fix google-explicit-constructor warnings in gui and ui." am: 170454b0fa am...

author Chih-hung Hsieh <chh@google.com>

Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)

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

Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)
author Chih-hung Hsieh <chh@google.com>
Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)
diff --cc include/gui/BufferQueue.h
Simple merge
diff --cc include/gui/ConsumerBase.h
Simple merge
diff --cc include/gui/IGraphicBufferProducer.h
Simple merge
diff --cc include/gui/Surface.h
Simple merge
author	Chih-hung Hsieh <chh@google.com>
	Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)
		1	2
include/gui/BufferQueue.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/gui/ConsumerBase.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/gui/IGraphicBufferProducer.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/gui/Surface.h	patch \|	diff1 \|	diff2 \|	blob \| history