Handle conflict from git merge release-20160315
authorSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 05:22:33 +0000 (14:22 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 05:22:33 +0000 (14:22 +0900)
commitf6c1097dcca7d6e21701b5da8e02fadf9133bb5a
tree473e9e3aaec893e9c637ea26ede5b2b19155fbb3
parentc0990a528572bec01cdeb0eba6e5ce1f23b3fbf7
parentd4978f483a9391194d04648b268808e6b8f20e86
Handle conflict from git merge release-20160315
debian/changelog