Merge branch 'ckm' into tizen 05/63005/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 21 Mar 2016 12:14:51 +0000 (13:14 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 21 Mar 2016 12:24:21 +0000 (13:24 +0100)
commitfbbe36e6d130cc3751b21a94a3f2055994526785
tree5bf44d12dfad70799f05ba2d60359545e9b7739b
parentf3d77c9bb641546f6d748dd95f6791d1d4f80c99
parent30321fb1393ede420c5cfdbe9f5ab2f5d105182d
Merge branch 'ckm' into tizen

Change-Id: I34396fcbad8b282e7d72ca6d596f4eb246d33840