Merge remote-tracking branch 'origin/release-20160315' into release-20160411
authorSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 07:49:41 +0000 (16:49 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 07:49:41 +0000 (16:49 +0900)

Trivial merge