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)
commit0cb4030bcd863380329522b54d7a190b07d392f6
tree036a9cd1feedd7b79b1759f18752a07abf1f18b2
parentb35f0da1f83d1eae51daff0564c3ae6cbaddfea2
parentce1a232a669a28667b7fe707aef5ddce1c678a5a
Merge branch 'tizen' into tizen_3.0

Conflicts:
packaging/mmfw-sysconf.spec

Change-Id: I33fb03c599912f9dd962d6e8c1a6f35e63679401