Merge remote-tracking branch 'origin/master' into notification-service
authorcc <ch79.cho@samsung.com>
Tue, 27 Sep 2016 10:56:58 +0000 (19:56 +0900)
committercc <ch79.cho@samsung.com>
Tue, 27 Sep 2016 10:58:06 +0000 (19:58 +0900)
commit79559592f20181defdc38c5db67c0a58cdde18b4
tree4cbb949014b8c432cb2b47ae90256b44b4307e82
parent1acc22c5af6da586c267332fd1062b4ca93cb874
parent7e3e554fbb2aabf6b69a30a6434e018d224deaf8
Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: Id78d68f152d09ceb140fda10eed16b36e44fc14b
Signed-off-by: cc <ch79.cho@samsung.com>