Merge branch 'devel/tizen_3.0' into tizen 04/54904/1 accepted/tizen/mobile/20151221.052204 accepted/tizen/tv/20151221.052241 accepted/tizen/wearable/20151221.052305 submit/tizen/20151218.121039 submit/tizen/20151221.015710
authorkibak.yoon <kibak.yoon@samsung.com>
Fri, 18 Dec 2015 12:07:11 +0000 (21:07 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Fri, 18 Dec 2015 12:07:18 +0000 (21:07 +0900)
* devel/tizen_3.0:
  capi-sensor: add a checking index of internal sensor type
  sensord: fix the bug which index can be out of range
  Version 2.0.0 (sycned with sensord)

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

Trivial merge