merge with master
[framework/system/libslp-sensor.git] / src /
2013-03-12 Jinkun JangTizen 2.1 base