Merge "Merge remote-tracking branch 'origin/extended-easysetup'"
authorMadan Lanka <lanka.madan@samsung.com>
Thu, 11 Aug 2016 05:11:55 +0000 (05:11 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 11 Aug 2016 05:11:56 +0000 (05:11 +0000)

Trivial merge