Merge branch 'devel/master' into tizen 14/111214/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:35:50 +0000 (11:35 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:35:58 +0000 (11:35 +0900)
commiteb54ed346b89d07336cd6920f7672ddb0432d9e8
treede4f21c8f322fb430c0734a207a00ae69a090727
parent4861cc5f2ab867db106e9c3e25316bc84e406ed1
parent0ade1ea02b460b002d9cd82cd3023a5107eb6294
Merge branch 'devel/master' into tizen

Change-Id: Ib2fe4bae51181971cab492583f586611bc05060f