Merge change I409d9b4a into eclair-mr2

* changes:
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID

core/jni/android_net_wifi_Wifi.cpp

@@ -20,6 +20,7 @@
 #include <utils/misc.h>
 #include <android_runtime/AndroidRuntime.h>
 #include <utils/Log.h>
+#include <utils/String16.h>
 
 #include "wifi.h"
 
@@ -92,7 +93,8 @@ static jstring doStringCommand(JNIEnv *env, const char *cmd)
     if (doCommand(cmd, reply, sizeof(reply)) != 0) {
         return env->NewStringUTF(NULL);
     } else {
-        return env->NewStringUTF(reply);
+        String16 str((char *)reply);
+        return env->NewString((const jchar *)str.string(), str.size());
     }
 }