Merge branch 'tizen' into ckm 86/84186/1
authorKyungwook Tak <k.tak@samsung.com>
Wed, 17 Aug 2016 07:43:20 +0000 (16:43 +0900)
committerKyungwook Tak <k.tak@samsung.com>
Wed, 17 Aug 2016 07:43:30 +0000 (16:43 +0900)
Change-Id: I247283c4040f55113b1bc6f7375c7e693dc11506
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Trivial merge