Handle conflicts merging from master branch
authorSoonKyu Park <sk7.park@samsung.com>
Tue, 4 Apr 2017 09:56:54 +0000 (18:56 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Tue, 4 Apr 2017 09:56:54 +0000 (18:56 +0900)
commite36614e4c59bd7f51ab7ce603b8a06f90d410b39
tree31dafb8471c431cc62c2e1232c1d2947f6d32397
parent12108eb346ef9b0de4ea4d973e68dd8eac454ec4
parentf91d1d019834ad5eb8d1140c47702265b8364958
Handle conflicts merging from master branch

Change-Id: I7716a4373225efed72f0d13037c512da3cd05d28
data/gbs
debian/changelog
depanneur