From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Tue, 28 Jun 2016 01:20:30 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160628.050740^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F76905%2F1;p=platform%2Fcore%2Fapi%2Fcontext.git

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>
---

87e6bcafccf2cc0fa41bd9864502a39844bae2e2