From: Somin Kim Date: Wed, 4 May 2016 01:28:09 +0000 (+0900) Subject: Merge branch 'devel/tizen_3.0' into tizen X-Git-Tag: accepted/tizen/common/20160504.153329^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F68370%2F1;p=platform%2Fcore%2Fapi%2Fcontext.git Merge branch 'devel/tizen_3.0' into tizen * devel/tizen_3.0: Fix coding rule Change-Id: I291c4a13c3ed246991954f5432b124bc42203639 Signed-off-by: Somin Kim --- 8600cc176909142080414d906c175314e13db28e