Merge "Camera: use gralloc mapper for handle import" into oc-dev

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

Thu, 27 Apr 2017 23:00:49 +0000 (23:00 +0000)

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

Thu, 27 Apr 2017 23:00:50 +0000 (23:00 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 27 Apr 2017 23:00:49 +0000 (23:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 27 Apr 2017 23:00:50 +0000 (23:00 +0000)
diff --cc camera/device/3.2/default/CameraDeviceSession.cpp
Simple merge
diff --cc camera/device/3.2/default/CameraDeviceSession.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 27 Apr 2017 23:00:49 +0000 (23:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 27 Apr 2017 23:00:50 +0000 (23:00 +0000)
		1	2
camera/device/3.2/default/CameraDeviceSession.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
camera/device/3.2/default/CameraDeviceSession.h	patch \|	diff1 \|	diff2 \|	blob \| history