projects / profile / mobile / apps / native / settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27ed60e dbde4c7)
Merge branch 'tizen' into tizen_3.0 17/97117/1 submit/tizen_3.0/20161111.074013
authorkiso.chang <kiso.chang@samsung.com>
Fri, 11 Nov 2016 07:32:00 +0000 (16:32 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Fri, 11 Nov 2016 07:32:13 +0000 (16:32 +0900)
Signed-off-by: kiso.chang <kiso.chang@samsung.com>
Conflicts:
setting-appmgr/src/setting-appmgr.c

Change-Id: I25151be6442f1e175ead6239c144538a53633f85


Trivial merge
Domain: Applications / Settings;