Merge "support haptic"
authorHyejin Kim <hyejin0906.kim@tizendev.org>
Fri, 23 Nov 2012 04:44:52 +0000 (13:44 +0900)
committerGerrit Code Review <gerrit2@kim11>
Fri, 23 Nov 2012 04:44:52 +0000 (13:44 +0900)

Trivial merge