Merge branch 'tizen_30' into tizen_40
authorjaekuk, lee <juku1999@samsung.com>
Wed, 4 Jan 2017 03:32:27 +0000 (12:32 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Wed, 4 Jan 2017 03:32:27 +0000 (12:32 +0900)
commit32dc18d846e6c80b2e37745a5c4c3f6460852680
tree92863a7226a0f114243f150ab44e4c34b9c721e2
parent959b8ed62893197be6b5786868dea8194ece1f52
parent193e6ee21adb9a80d4ef885c336ce2c54d5edc33
Merge branch 'tizen_30' into tizen_40