Merge "Merge branch 'master' into notification-service" into notification-service
authorUze Choi <uzchoi@samsung.com>
Fri, 17 Jun 2016 05:06:20 +0000 (05:06 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 17 Jun 2016 05:06:20 +0000 (05:06 +0000)

Trivial merge