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)

Trivial merge