Merge branch 'tizen_3.0' into tizen 90/108390/1 accepted/tizen/ivi/20170111.222751 accepted/tizen/mobile/20170111.222657 accepted/tizen/tv/20170111.222714 accepted/tizen/wearable/20170111.222732 submit/tizen/20170111.081223
authorwchang kim <wchang.kim@samsung.com>
Wed, 4 Jan 2017 07:29:43 +0000 (16:29 +0900)
committerwchang kim <wchang.kim@samsung.com>
Wed, 4 Jan 2017 07:29:43 +0000 (16:29 +0900)
commit98d25c23825989b1c49d09f0c840164d1fc0fd16
tree81d184d0bbf2a9f7b81d65d6df3c5c47d830b72d
parent4a834faa9656c02c3eea6a1a0307d8bcf6f4b340
parent9ce7b946b0aeb3c5ef9f6bc4033c5aedecb009ec
Merge branch 'tizen_3.0' into tizen

Conflicts:
packaging/system-plugin.spec

Change-Id: Ibf39413dac46328dd387e296191272e8cfe0e472
packaging/system-plugin.spec