Merge branch 'develop' into platform_3.0
authorJinhyung Choi <jinh0.choi@samsung.com>
Tue, 25 Oct 2016 09:44:48 +0000 (18:44 +0900)
committerJinhyung Choi <jinh0.choi@samsung.com>
Tue, 25 Oct 2016 09:44:52 +0000 (18:44 +0900)
Change-Id: I3e6e8a6bf42851c06bb4e477c3fab3a5c5c83d29
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

Trivial merge