Merge branch 'develop_2.3' into platform_2.3
authorMunkyu Im <munkyu.im@samsung.com>
Wed, 6 Jul 2016 02:30:02 +0000 (11:30 +0900)
committerMunkyu Im <munkyu.im@samsung.com>
Wed, 6 Jul 2016 02:30:12 +0000 (11:30 +0900)
Change-Id: I24ec9f18905b3745843735a3484d44fe3340f990
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

Trivial merge