Merge branch 'tizen_30' into tizen_40 submit/tizen/20170109.135547
authorjaekuk, lee <juku1999@samsung.com>
Mon, 9 Jan 2017 13:55:28 +0000 (22:55 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Mon, 9 Jan 2017 13:55:28 +0000 (22:55 +0900)
commit159379b9aaf828ffc3c5d0507adea4b62ce806ec
tree271453a851a13b03acfc3f5ec0372c83e68cd6ee
parentf1ed40038647ceb16bc81fcfd5c97b7dc399d4dd
parent88e577caa2f01c84b3ff6f7a5643aaeb7b3a3435
Merge branch 'tizen_30' into tizen_40