Merge branch 'devel/master' into tizen 26/66426/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 02:10:57 +0000 (11:10 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 02:12:05 +0000 (11:12 +0900)
Change-Id: Ie44da75a33d7d7a6ebf4772f71ac38a406057162


Trivial merge