From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Thu, 10 Dec 2015 02:59:57 +0000 (+0900)
Subject: Merge branch 'tizen' into devel/tizen_3.0
X-Git-Tag: submit/tizen/20160118.014643^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F53875%2F1;p=platform%2Fcore%2Fapi%2Fcontext.git

Merge branch 'tizen' into devel/tizen_3.0

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

045b06b3028eae7557a53a3b1531d06057f7a7b1