Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup
authorMadan Lanka <lanka.madan@samsung.com>
Wed, 3 Aug 2016 13:53:44 +0000 (13:53 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 3 Aug 2016 13:53:44 +0000 (13:53 +0000)
commit24866974a046cb6ace8d77ad29c444fed7c19e98
treed417d94f832f675835a04cdead3f1cf980d41cee
parentb7da1bc1a9d517090b59bf474e08698585797ad2
parentcd34db38c82a503df15de84238fe7a7330241e99
Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup