Merge branch 'develop' 96/121996/1
authorHeekyoung, Oh <heekyoung.oh@samsung.com>
Thu, 30 Mar 2017 01:45:14 +0000 (10:45 +0900)
committerHeekyoung, Oh <heekyoung.oh@samsung.com>
Thu, 30 Mar 2017 01:46:09 +0000 (10:46 +0900)
Change-Id: If36f75d6dc14030d0b2726987af5f42ca4afc8ce


Trivial merge