Merge branch 'tizen_30' into tizen_40
authorjaekuk, lee <juku1999@samsung.com>
Wed, 4 Jan 2017 02:17:26 +0000 (11:17 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Wed, 4 Jan 2017 02:17:26 +0000 (11:17 +0900)
commit959b8ed62893197be6b5786868dea8194ece1f52
tree70ed124bde2a0008c4eec2836add2e6272756dc3
parentff4a2aafc637d940de0ea2e7d91158773a608bc9
parent8fd2a9b668c0e3cace151cc63ec168194afbf78b
Merge branch 'tizen_30' into tizen_40