Merge branch 'master' into cloud-interface 39/13539/1
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 21 Oct 2016 04:39:18 +0000 (13:39 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 21 Oct 2016 04:39:18 +0000 (13:39 +0900)
Change-Id: I882605a16ce697ec26b1cd29653dc44c8618f690
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Trivial merge