Merge "Change drm/crypto service names to "default"" into oc-dev am: 8eb3a1ea59

author Jeff Tinker <jtinker@google.com>

Thu, 13 Apr 2017 02:39:47 +0000 (02:39 +0000)

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

Thu, 13 Apr 2017 02:39:47 +0000 (02:39 +0000)
author Jeff Tinker <jtinker@google.com>
Thu, 13 Apr 2017 02:39:47 +0000 (02:39 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 02:39:47 +0000 (02:39 +0000)
diff --cc drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
Simple merge
diff --cc drm/1.0/vts/functional/drm_hal_vendor_test.cpp
Simple merge
author	Jeff Tinker <jtinker@google.com>
	Thu, 13 Apr 2017 02:39:47 +0000 (02:39 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 13 Apr 2017 02:39:47 +0000 (02:39 +0000)
		1	2
drm/1.0/vts/functional/drm_hal_clearkey_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
drm/1.0/vts/functional/drm_hal_vendor_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history