Merge branch 'devel/master (1.1.16)' into tizen 63/57063/2
authortaeyoon <taeyoon0.lee@samsung.com>
Fri, 15 Jan 2016 02:14:35 +0000 (11:14 +0900)
committerTaeyoon Lee <taeyoon0.lee@samsung.com>
Fri, 15 Jan 2016 06:15:55 +0000 (22:15 -0800)
Change-Id: I93ed3b7cbcd61c4a7f167394432f01e68966323a


Trivial merge