Revert "SF: accommodate 1.2 format in sampling code"
This reverts commit 7994773b660775f1f1a029c7fdbe0885cb61ecee.
Reason for revert: broke build
Change-Id: Ib146556187088f57ec6aec0216ed1b4b270d8c9b
diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.h b/services/surfaceflinger/DisplayHardware/ComposerHal.h
index 542e840..ba3d2a6 100644
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.h
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.h
@@ -48,11 +48,11 @@
using types::V1_0::ColorTransform;
using types::V1_0::Transform;
+using types::V1_1::PixelFormat;
using types::V1_1::RenderIntent;
using types::V1_2::ColorMode;
using types::V1_2::Dataspace;
using types::V1_2::Hdr;
-using types::V1_2::PixelFormat;
using V2_1::Config;
using V2_1::Display;