commit ae2e54faf71f4ff3d96216031c66d14dfbbceb5f
author David 'Digit' Turner <digit@google.com> Thu Jan 23 23:34:45 2014 +0100
committer David 'Digit' Turner <digit@google.com> Thu Jan 23 23:34:45 2014 +0100
tree c5f06cb0cf9c3beb625ef8b394c7a32a1df2aa7f
parent 1ee5f5ef5a3d75bebcc9cd78fd9150c68f5485fb
parent 017649d62cfb6e6591dc4487eeaee2903dd63032

resolved conflicts for merge of 017649d6 to klp-modular-dev

Conflicts:
	modules/Android.mk

Change-Id: I6b84d2320be98b6af1f0cab729a917cf84cd9524

modules/Android.mk

diff --git a/modules/Android.mk b/modules/Android.mk
index 1935b11..07fa5ee 100644
--- a/modules/Android.mk
+++ b/modules/Android.mk
@@ -1,3 +1,3 @@
 hardware_modules := gralloc hwcomposer audio nfc nfc-nci local_time \
-	power usbaudio audio_remote_submix camera consumerir sensors
+	power usbaudio audio_remote_submix camera consumerir sensors vibrator
 include $(call all-named-subdir-makefiles,$(hardware_modules))