Merge branch 'devel/tizen_3.0' into tizen 05/76905/1 accepted/tizen/common/20160628.141453 accepted/tizen/ivi/20160628.065909 accepted/tizen/mobile/20160628.065923 accepted/tizen/wearable/20160628.065847 submit/tizen/20160628.050740
authorMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 28 Jun 2016 01:20:30 +0000 (10:20 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 28 Jun 2016 01:20:30 +0000 (10:20 +0900)
commit87e6bcafccf2cc0fa41bd9864502a39844bae2e2
treeb9e3329901903074defe03c06801953f336b6828
parentb10683a099b2f89cd2b2ea744e4b6a49de840a52
parentfc41240b622b041f9ae4cd129594ea444a0e4532
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Fix error return of context_trigger_custom_publish
  Include Types.h explicitly

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