Merge "Merge remote-tracking branch 'origin/master' into notification-service" into...
authorUze Choi <uzchoi@samsung.com>
Fri, 19 Aug 2016 11:49:19 +0000 (11:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 19 Aug 2016 11:49:19 +0000 (11:49 +0000)

Trivial merge