From: SoonKyu Park <sk7.park@samsung.com>
Date: Thu, 16 Jun 2016 08:32:15 +0000 (+0900)
Subject: Handle conflicts from git merge release-20160531
X-Git-Tag: debian/0.7.5~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-20160615;p=tools%2Fgit-buildpackage.git

Handle conflicts from git merge release-20160531

Change-Id: I1cae90068ab2576d756188e36e112550c7c293de
---

06e10c8b1f4f355e884d52a61b7762e733975d55