Merge remote-tracking branch 'origin/develop' into mw 24/22424/1 mw
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Tue, 3 Jun 2014 09:09:52 +0000 (18:09 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Tue, 3 Jun 2014 09:09:52 +0000 (18:09 +0900)
Change-Id: Ic95efb288d23058159b8ad017490cfd5620d4715
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

Trivial merge