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)
commitf03c8766f8326defb4c65dcc57d61ba004c0db4e
tree770407901008e6ae9b50d694cfb20eebfdb4ef91
parent9edd4ab2b174ed7ef5165644b043cb1f4b279f88
parent112597ac33022a4ad678f228e97cdff627eee9b6
Merge "Merge branch 'master' into notification-service" into notification-service