Merge "Template: Use standard template file if image template file doesn't exist...
authorSangho Park <sangho1206.park@samsung.com>
Thu, 18 Sep 2014 02:18:33 +0000 (11:18 +0900)
committerGerrit Code Review <gerrit2@twin.s-core.co.kr>
Thu, 18 Sep 2014 02:18:33 +0000 (11:18 +0900)

Trivial merge