Version 1.5.4

svn merge -c  37258 https://dart.googlecode.com/svn/branches/bleeding_edge 1.5
svn merge -c  37262 https://dart.googlecode.com/svn/branches/bleeding_edge 1.5
svn merge -c  37267 https://dart.googlecode.com/svn/branches/bleeding_edge 1.5

R=kasperl@google.com

Review URL: https://codereview.chromium.org//370673003

git-svn-id: http://dart.googlecode.com/svn/branches/1.5@37998 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/tools/VERSION b/tools/VERSION
index 968b1c7..45dbca7 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 1
 MINOR 5
-PATCH 3
+PATCH 4
 PRERELEASE 0
 PRERELEASE_PATCH 0
diff --git a/tools/bots/dartium_android.py b/tools/bots/dartium_android.py
index e10afd5..18bc171 100644
--- a/tools/bots/dartium_android.py
+++ b/tools/bots/dartium_android.py
@@ -40,7 +40,9 @@
 def UploadAPKs(options):
   with bot.BuildStep('Upload apk'):
     revision = utils.GetSVNRevision()
-    namer = bot_utils.GCSNamer()
+    bot_name = os.environ.get("BUILDBOT_BUILDERNAME")
+    channel = bot_utils.GetChannelFromName(bot_name)
+    namer = bot_utils.GCSNamer(channel=channel)
     gsutil = bot_utils.GSUtil()
 
     web_link_prefix = 'https://storage.cloud.google.com/'