Merge from branch 'tizen' 64/92664/1
authorKyuho Jo <kyuho.jo@samsung.com>
Tue, 18 Oct 2016 04:18:44 +0000 (13:18 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Tue, 18 Oct 2016 04:18:44 +0000 (13:18 +0900)
Change-Id: I33eb611d669353a83e54e941040def7676003e4e
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge