Merge branch 'devel/tizen_3.0' into tizen 35/70135/1 accepted/tizen/common/20160519.191420 accepted/tizen/ivi/20160519.085333 accepted/tizen/mobile/20160519.085342 accepted/tizen/tv/20160519.085323 accepted/tizen/wearable/20160519.085329 submit/tizen/20160519.031047
authorkibak.yoon <kibak.yoon@samsung.com>
Wed, 18 May 2016 08:29:19 +0000 (17:29 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Wed, 18 May 2016 08:29:23 +0000 (17:29 +0900)
commit22ed2de125ff4d3d42b9a0ff50407bab949cc7c6
treef3503997a755c859d89024e8fc8fd41fcb6442eb
parentadaf620d85423dccf5bddb5a256698c0949682ec
parent8bf02881e1590229e531cc4246137658e72c1352
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  sensor: remove wrong api version in doxygen

Change-Id: I06390489b70d01e5c137ee99a1c7afa06857a630