Merge "Merge branch 'master' into notification-service" into notification-service
authorUze Choi <uzchoi@samsung.com>
Tue, 26 Jul 2016 00:39:12 +0000 (00:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Tue, 26 Jul 2016 00:39:12 +0000 (00:39 +0000)
commit29003b55c6589b291a0c34455bd08878870ae997
tree0a9e5f7a862cdc3a01078c1fdad25c0de8622041
parent2d864f42ebbe784250d4d418cb7de7233f1886ac
parent7b017138673175a8a5891b242efca8ed44227349
Merge "Merge branch 'master' into notification-service" into notification-service