Merge branch 'devel/tizen' into tizen 59/163059/1 accepted/tizen/5.0/unified/20181102.014604 accepted/tizen/unified/20171207.124717 submit/tizen/20171207.053040 submit/tizen_5.0/20181101.000002
authorSomin Kim <somin926.kim@samsung.com>
Thu, 7 Dec 2017 05:29:19 +0000 (14:29 +0900)
committerSomin Kim <somin926.kim@samsung.com>
Thu, 7 Dec 2017 05:29:19 +0000 (14:29 +0900)
commit49f1ffb2b0c1b1745550dc8cebd826569038ef31
tree9f28f31a958f12035aec888d3f8e0d122c11f7d1
parent6c7bc7ae94499ab2351f6c8eafac74c31db53a4f
parentd547b448db138c101429d8f4de05358eb2e56c80
Merge branch 'devel/tizen' into tizen

* devel/tizen:
  Fix doxygen error(context history)

Change-Id: Iac41cc0b4c2535bccef7e809146c037c5fc09678
Signed-off-by: Somin Kim <somin926.kim@samsung.com>