Merge branch 'devel/tizen_3.0' into tizen 57/87357/1 accepted/tizen/common/20160907.154906 accepted/tizen/ivi/20160908.044440 accepted/tizen/mobile/20160908.044325 accepted/tizen/wearable/20160908.044414 submit/tizen/20160907.123648
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 7 Sep 2016 12:22:49 +0000 (21:22 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 7 Sep 2016 12:22:49 +0000 (21:22 +0900)
commit055dd51fd5215bae3f3055d3656805b69c33f391
tree8c30976da1cdf1ebbb6f490d5944d195c3f966d5
parent442b6b8d2d6740770b959491f5105bb11f345b36
parent7f299995db8b396d22c64c5a6f98d52c1e9905db
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Version 0.9.6
  Added Battery Satistics Parameters to Context History enums
  Add the double-precision attribute retrieving function context_history_record_get_double()
  [my-place] accept empty lists.
  History types internal & trigger types internal removed
  Version 0.9.5
  [my-place] Internal API.

Change-Id: Ibf322ceb698ad4a36fed48e16b8567ef5ddca01e
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>