Merge remote-tracking branch 'badge/tizen'
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 00:48:19 +0000 (09:48 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 00:48:19 +0000 (09:48 +0900)
Change-Id: I95342158cb8fc9d8d3d6754ddb46f351f12bbeae


Trivial merge