Merge branch 'devel/master' into tizen 38/116538/1
authorsuhyung Eom <suhyung.eom@samsung.com>
Mon, 27 Feb 2017 02:13:41 +0000 (11:13 +0900)
committersuhyung Eom <suhyung.eom@samsung.com>
Mon, 27 Feb 2017 02:14:40 +0000 (11:14 +0900)
commitb29c756888c1cfbd6d5e6d576d6c7b9959c08871
tree7b3f48be1fb23b4f17da8af6b97056487aec39ca
parent8b40dedadd1c0a4eb522668c1a4b2e573d64eed2
parentc3f503f75df2df7573512636441232975455e758
Merge branch 'devel/master' into tizen

Change-Id: I944a05ca5ee81b891754bf59bf2dc06810f2b008