Merge "Merge remote-tracking branch 'origin/notification-service' Updated with static...
authorUze Choi <uzchoi@samsung.com>
Mon, 12 Sep 2016 04:44:07 +0000 (04:44 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 12 Sep 2016 04:44:08 +0000 (04:44 +0000)

Trivial merge