commit d269bf4328b608d43b357adbbe3b25d7136883bf
author Dan Willemsen <dwillemsen@google.com> Wed Jul 13 11:28:47 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Jul 13 11:28:47 2016 -0700
tree e2613723b9dbf0062d0d133e828deee6decdad4c
parent 5aeef066b13f2f975550b5964cc065f2be43aa73
parent 69ed5d9a8306ee0427f378abe85cabfc5c3c1f17

resolve merge conflicts of 69ed5d9 to stage-aosp-master

Change-Id: I1e86670dcf4e3187efca4beff673bbc057cbd509

modules/Android.mk

diff --git a/modules/Android.mk b/modules/Android.mk
index 3bd0943..2a58b3e 100644
--- a/modules/Android.mk
+++ b/modules/Android.mk
@@ -1,4 +1,4 @@
-hardware_modules := gralloc hwcomposer audio nfc nfc-nci local_time \
-	power usbaudio audio_remote_submix camera usbcamera consumerir sensors vibrator \
-	tv_input fingerprint input vehicle thermal vr
+hardware_modules := gralloc hwcomposer \
+	usbaudio audio_remote_submix camera usbcamera sensors \
+	input vehicle thermal vr
 include $(call all-named-subdir-makefiles,$(hardware_modules))