Merge branch 'tizen_3.0_develop' into tizen_3.0
authorJinhyung Jo <jinhyung.jo@samsung.com>
Wed, 23 Mar 2016 09:24:56 +0000 (18:24 +0900)
committerJinhyung Jo <jinhyung.jo@samsung.com>
Wed, 23 Mar 2016 09:25:07 +0000 (18:25 +0900)
Change-Id: I8324a0a23ed3c63fb46f624b8b7f4b4b409e55e0
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Trivial merge