Merge branch 'tizen' into tizen_3.0 76/102076/1
authorSeokHoon Lee <andy.shlee@samsung.com>
Mon, 5 Dec 2016 02:01:37 +0000 (11:01 +0900)
committerSeokHoon Lee <andy.shlee@samsung.com>
Mon, 5 Dec 2016 02:02:03 +0000 (11:02 +0900)
Conflicts:
packaging/mmfw-sysconf.spec

Change-Id: I33fb03c599912f9dd962d6e8c1a6f35e63679401


Trivial merge