Merge "sensor: haptic device is added." into tizen
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 24 Jun 2014 04:43:54 +0000 (21:43 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 24 Jun 2014 04:43:54 +0000 (21:43 -0700)

Trivial merge