Resolve uprev conflict

Change-Id: I61bc63685415616b10ebcd0a9484c276b2f0509e
diff --git a/media-sound/adhd/adhd-0.0.6-r2279.ebuild b/media-sound/adhd/adhd-0.0.6-r2280.ebuild
similarity index 96%
rename from media-sound/adhd/adhd-0.0.6-r2279.ebuild
rename to media-sound/adhd/adhd-0.0.6-r2280.ebuild
index 8651760..92a041a 100644
--- a/media-sound/adhd/adhd-0.0.6-r2279.ebuild
+++ b/media-sound/adhd/adhd-0.0.6-r2280.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="82ba61f11c1f49704db5fcaf7b14ff1cb96860cc"
-CROS_WORKON_TREE="340683fa35432166d1b5c27fba5f01b818c27d02"
+CROS_WORKON_COMMIT="0d60d0c42b3e00618c14326562572736601ad113"
+CROS_WORKON_TREE="1bc4e800ffbd9caa4c18d5090652e5452ed3afae"
 CROS_WORKON_PROJECT="chromiumos/third_party/adhd"
 CROS_WORKON_LOCALNAME="adhd"
 CROS_WORKON_USE_VCSID=1
diff --git a/media-sound/cras_bench/cras_bench-0.0.1-r1.ebuild b/media-sound/cras_bench/cras_bench-0.0.1-r2.ebuild
similarity index 91%
rename from media-sound/cras_bench/cras_bench-0.0.1-r1.ebuild
rename to media-sound/cras_bench/cras_bench-0.0.1-r2.ebuild
index 0d0c413..9082cbd 100644
--- a/media-sound/cras_bench/cras_bench-0.0.1-r1.ebuild
+++ b/media-sound/cras_bench/cras_bench-0.0.1-r2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="82ba61f11c1f49704db5fcaf7b14ff1cb96860cc"
-CROS_WORKON_TREE="340683fa35432166d1b5c27fba5f01b818c27d02"
+CROS_WORKON_COMMIT="0d60d0c42b3e00618c14326562572736601ad113"
+CROS_WORKON_TREE="1bc4e800ffbd9caa4c18d5090652e5452ed3afae"
 CROS_WORKON_PROJECT="chromiumos/third_party/adhd"
 CROS_WORKON_LOCALNAME="adhd"
 CROS_WORKON_USE_VCSID=1