Merge "Merge branch 'master' into easysetup" into easysetup
authorlankamadan <lanka.madan@samsung.com>
Fri, 19 Feb 2016 10:42:40 +0000 (10:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 19 Feb 2016 10:42:41 +0000 (10:42 +0000)

Trivial merge