Merge branch 'develop' into tizen_studio_1.1_p3.0
authorMunkyu Im <munkyu.im@samsung.com>
Mon, 2 Jan 2017 10:00:49 +0000 (19:00 +0900)
committerMunkyu Im <munkyu.im@samsung.com>
Mon, 2 Jan 2017 10:00:55 +0000 (19:00 +0900)
Change-Id: I9ab2663153ba17eba0124ca2b1545923ed069e37
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

Trivial merge