Merge branch 'feature/support_multiple_mock_type_device' into develop
authorDonghoon Shin <dhs.shine@gmail.com>
Wed, 21 Sep 2016 04:49:12 +0000 (13:49 +0900)
committerDonghoon Shin <dhs.shine@gmail.com>
Wed, 21 Sep 2016 04:49:12 +0000 (13:49 +0900)

Trivial merge