Merge branch 'devel/master' into tizen 51/66451/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 04:44:48 +0000 (13:44 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 04:46:07 +0000 (13:46 +0900)
Change-Id: I4433f83ec6790b8e2804c868b3aeb1b3e3198c15


Trivial merge