Merge "Update Emulator content" into tizen
authorMijin Cho <mijin85.cho@samsung.com>
Wed, 16 Aug 2017 04:53:37 +0000 (04:53 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 16 Aug 2017 04:53:38 +0000 (04:53 +0000)

Trivial merge