Merge "Merge branch 'master' into notification-service" into notification-service
authorUze Choi <uzchoi@samsung.com>
Wed, 20 Jul 2016 07:34:14 +0000 (07:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 20 Jul 2016 07:34:15 +0000 (07:34 +0000)

Trivial merge