Merge "merge conf file from master branch" into template_2.0
authorGeunSun Lee <gs86.lee@samsung.com>
Tue, 7 Nov 2017 03:05:17 +0000 (03:05 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 7 Nov 2017 03:05:17 +0000 (03:05 +0000)
commit5becc0076121e03accfbffd7be6d8c6d1c0fb1f5
tree45427204f82d73ecc106c37f302f5a1b9875f234
parentd441a3ad70745daa7857ecc5b141725c854cc7ee
parent318f24c8ac011f072c1881ab65fb1bbb7988beee
Merge "merge conf file from master branch" into template_2.0