Merge remote-tracking branch 'system-settings/tizen'
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 01:50:18 +0000 (10:50 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 01:50:18 +0000 (10:50 +0900)
Change-Id: I9163d6966c2fc4302ac0451ea08707fca542f8ec


Trivial merge