Resolve uprev conflict
Change-Id: Ia2806e0d8a9373edf6bc442209bec170a0e4d2f5
diff --git a/chromeos-base/debugd-client/debugd-client-0.0.1-r2282.ebuild b/chromeos-base/debugd-client/debugd-client-0.0.1-r2283.ebuild
similarity index 85%
rename from chromeos-base/debugd-client/debugd-client-0.0.1-r2282.ebuild
rename to chromeos-base/debugd-client/debugd-client-0.0.1-r2283.ebuild
index 283e8e3..85b3aa3 100644
--- a/chromeos-base/debugd-client/debugd-client-0.0.1-r2282.ebuild
+++ b/chromeos-base/debugd-client/debugd-client-0.0.1-r2283.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
-CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "96c52c174043d3401aeade9ce7790f8488305677" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="c43f07a38fe2055c10c95b0a6aeebdfbe73e2e38"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9a6a63bdae61e619e74357a4cd21ab4674791490" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
CROS_WORKON_INCREMENTAL_BUILD=1
CROS_WORKON_LOCALNAME="platform2"
CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/debugd/debugd-0.0.1-r3349.ebuild b/chromeos-base/debugd/debugd-0.0.1-r3350.ebuild
similarity index 94%
rename from chromeos-base/debugd/debugd-0.0.1-r3349.ebuild
rename to chromeos-base/debugd/debugd-0.0.1-r3350.ebuild
index 9b5626e..c7ff084 100644
--- a/chromeos-base/debugd/debugd-0.0.1-r3349.ebuild
+++ b/chromeos-base/debugd/debugd-0.0.1-r3350.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
-CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "96c52c174043d3401aeade9ce7790f8488305677" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="c43f07a38fe2055c10c95b0a6aeebdfbe73e2e38"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9a6a63bdae61e619e74357a4cd21ab4674791490" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
CROS_WORKON_INCREMENTAL_BUILD="1"
CROS_WORKON_PROJECT="chromiumos/platform2"
CROS_WORKON_LOCALNAME="platform2"
diff --git a/dev-util/hdctools/hdctools-0.0.1-r1655.ebuild b/dev-util/hdctools/hdctools-0.0.1-r1656.ebuild
similarity index 91%
rename from dev-util/hdctools/hdctools-0.0.1-r1655.ebuild
rename to dev-util/hdctools/hdctools-0.0.1-r1656.ebuild
index fe63f88..285cefcd 100644
--- a/dev-util/hdctools/hdctools-0.0.1-r1655.ebuild
+++ b/dev-util/hdctools/hdctools-0.0.1-r1656.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="017323fbb267e51d3ddddabf671e0efc9e341c55"
-CROS_WORKON_TREE="e04c11551c8fcad79479f30da6f7288efd28cb8a"
+CROS_WORKON_COMMIT="7681302b796763ac6c31698e97efc7eb0de72f97"
+CROS_WORKON_TREE="88b1aaf2e05c457f543c0ccc678ca85f510800c6"
CROS_WORKON_PROJECT="chromiumos/third_party/hdctools"
PYTHON_COMPAT=( python3_{6..9} )
