diff --git a/talk/examples/android/assets/channel.html b/talk/examples/android/assets/channel.html
index 86c2b44032..d593442879 100644
--- a/talk/examples/android/assets/channel.html
+++ b/talk/examples/android/assets/channel.html
@@ -5,39 +5,19 @@
   <!--
   Helper HTML that redirects Google AppEngine's Channel API to a JS object named
   |androidMessageHandler|, which is expected to be injected into the WebView
-  rendering this page by an Android app's class such as AppRTCClient
+  rendering this page by an Android app's class such as AppRTCClient.
   -->
   <body onbeforeunload="closeSocket()" onload="openSocket()">
     <script type="text/javascript">
-      // QueryString is copy/pasta from
-      // chromium's chrome/test/data/media/html/utils.js.
-      var QueryString = function () {
-        // Allows access to query parameters on the URL; e.g., given a URL like:
-        //    http://<url>/my.html?test=123&bob=123
-        // parameters can now be accessed via QueryString.test or QueryString.bob.
-        var params = {};
-
-        // RegEx to split out values by &.
-        var r = /([^&=]+)=?([^&]*)/g;
-
-        // Lambda function for decoding extracted match values. Replaces '+' with
-        // space so decodeURIComponent functions properly.
-        function d(s) { return decodeURIComponent(s.replace(/\+/g, ' ')); }
-
-        var match;
-        while (match = r.exec(window.location.search.substring(1)))
-          params[d(match[1])] = d(match[2]);
-
-        return params;
-      } ();
+      var token = androidMessageHandler.getToken();
+      if (!token)
+        throw "Missing/malformed token parameter: [" + token + "]";
 
       var channel = null;
       var socket = null;
 
       function openSocket() {
-        if (!QueryString.token || !QueryString.token.match(/^[A-z0-9_-]+$/))
-          throw "Missing/malformed token parameter: " + QueryString.token;
-        channel = new goog.appengine.Channel(QueryString.token);
+        channel = new goog.appengine.Channel(token);
         socket = channel.open({
           'onopen': function() { androidMessageHandler.onOpen(); },
           'onmessage': function(msg) { androidMessageHandler.onMessage(msg.data); },
diff --git a/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java b/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java
index 46f638d657..29a9113480 100644
--- a/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java
+++ b/talk/examples/android/src/org/appspot/apprtc/GAEChannelClient.java
@@ -83,10 +83,11 @@ public class GAEChannelClient {
               ", desc: " + description);
         }
       });
-    proxyingMessageHandler = new ProxyingMessageHandler(activity, handler);
+    proxyingMessageHandler =
+        new ProxyingMessageHandler(activity, handler, token);
     webView.addJavascriptInterface(
         proxyingMessageHandler, "androidMessageHandler");
-    webView.loadUrl("file:///android_asset/channel.html?token=" + token);
+    webView.loadUrl("file:///android_asset/channel.html");
   }
 
   /** Close the connection to the AppEngine channel. */
@@ -106,10 +107,14 @@ public class GAEChannelClient {
     private final Activity activity;
     private final MessageHandler handler;
     private final boolean[] disconnected = { false };
+    private final String token;
 
-    public ProxyingMessageHandler(Activity activity, MessageHandler handler) {
+    public
+     ProxyingMessageHandler(Activity activity, MessageHandler handler,
+                            String token) {
       this.activity = activity;
       this.handler = handler;
+      this.token = token;
     }
 
     public void disconnect() {
@@ -120,6 +125,10 @@ public class GAEChannelClient {
       return disconnected[0];
     }
 
+    @JavascriptInterface public String getToken() {
+      return token;
+    }
+
     @JavascriptInterface public void onOpen() {
       activity.runOnUiThread(new Runnable() {
           public void run() {
diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index 192ba03ad6..9170ba04b5 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -238,6 +238,7 @@
                 'examples/android/AndroidManifest.xml',
                 'examples/android/README',
                 'examples/android/ant.properties',
+                'examples/android/assets/channel.html',
                 'examples/android/build.xml',
                 'examples/android/jni/Android.mk',
                 'examples/android/project.properties',
