auto import from //branches/cupcake_rel/...@140373
diff --git a/services/jni/onload.cpp b/services/jni/onload.cpp
index 3d68cfb..26200d3 100644
--- a/services/jni/onload.cpp
+++ b/services/jni/onload.cpp
@@ -7,7 +7,7 @@
 int register_android_server_AlarmManagerService(JNIEnv* env);
 int register_android_server_BatteryService(JNIEnv* env);
 int register_android_server_KeyInputQueue(JNIEnv* env);
-int register_android_os_Vibrator(JNIEnv* env);
+int register_android_server_HardwareService(JNIEnv* env);
 int register_android_server_SensorService(JNIEnv* env);
 int register_android_server_SystemServer(JNIEnv* env);
 };
@@ -26,7 +26,7 @@
     LOG_ASSERT(env, "Could not retrieve the env!");
 
     register_android_server_KeyInputQueue(env);
-    register_android_os_Vibrator(env);
+    register_android_server_HardwareService(env);
     register_android_server_AlarmManagerService(env);
     register_android_server_BatteryService(env);
     register_android_server_SensorService(env);