Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup
authorUze Choi <uzchoi@samsung.com>
Mon, 25 Jul 2016 01:08:44 +0000 (01:08 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 25 Jul 2016 01:08:44 +0000 (01:08 +0000)
commit9b75b21e041df26d6026e00f37a270f48d1d8e65
treeb3151e6bf44a2d2e539ee3a12370d1d78dd5bd32
parent1697a97912127b9ab29ae9003bfd67c1f0b8cc2b
parent8cdaa91d823c3db73ef0d513863fd67d728bc418
Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup