Merge branch 'tizen' into tizen_3.0 60/95460/1
authorJeongmo Yang <jm80.yang@samsung.com>
Thu, 3 Nov 2016 09:30:04 +0000 (18:30 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Thu, 3 Nov 2016 09:30:08 +0000 (18:30 +0900)
Change-Id: I1932cd877dcb850249787cd617c2fae5e9b9082a


Trivial merge