Merge remote-tracking branch 'data-control/tizen'
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 00:50:01 +0000 (09:50 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 00:50:01 +0000 (09:50 +0900)
Change-Id: I78d789c1beb9e690c9add0283f99152a7f2f499f


Trivial merge