Merge branch 'devel/tizen_3.0' into tizen 48/63948/1 accepted/tizen/mobile/20160329.043559 submit/tizen_mobile/20160329.031840
authorkibak.yoon <kibak.yoon@samsung.com>
Tue, 29 Mar 2016 03:15:52 +0000 (12:15 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Tue, 29 Mar 2016 03:15:59 +0000 (12:15 +0900)
commitde8a7d9421a976315ca787e48aff49306551e41c
tree94aa7468e2fee4ad384465b0007d6c2dd3ced332
parent6f78487b32d03d7d098d8babee5467e22c765540
parent694564a04ffd22f1eaf8908cb64eac82fba34eb0
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  sensor-hal: proxi: fix the value of proximity

Change-Id: Ia7be8947ead7e271712a1d5b79c75d009c24a785
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>