merge with master
[platform/core/system/haptic-module-tizen.git] / test /
2013-03-15 Jinkun Jangmerge with master