Merge branch 'devel/master(1.2.18)' into tizen 83/104483/1
authorsuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 10:37:23 +0000 (19:37 +0900)
committersuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 10:37:56 +0000 (19:37 +0900)
commit2a67263e58f7199e3b335018a4636f06a2de8bae
treef26c23d305daf7008c6119bc7511ed1092a35a46
parent61c2c5bfb5957933afbbc0a9c823b1f2842fc1c4
parentb7e8fc2502ba9f29cdba74f98dc7a24e97e3eda9
Merge branch 'devel/master(1.2.18)' into tizen

Change-Id: I55c7a9122ed65b1beb882da42ffb7b2e520b08c0