Merge remote-tracking branch 'origin/tizen_3.0' into tizen 05/109105/1
authorpr.jung <pr.jung@samsung.com>
Mon, 9 Jan 2017 01:52:28 +0000 (10:52 +0900)
committerpr.jung <pr.jung@samsung.com>
Mon, 9 Jan 2017 01:52:28 +0000 (10:52 +0900)
Change-Id: I4d4b60a6ffcba605dccb0af9cb8fac6c0a4c73d0
Signed-off-by: pr.jung <pr.jung@samsung.com>

Trivial merge