commit 726a570258828d85e401ab62fd4220812fe9344f
author Mike Lockwood <lockwood@android.com> Wed Nov 25 15:05:51 2009 -0500
committer Mike Lockwood <lockwood@android.com> Wed Nov 25 15:05:51 2009 -0500
tree 11af59ce57ec093c026aac8516bddc31cb031a5a
parent 3fdee335fe95ab94ef1ee619ad37f9369447fde5
parent dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c

resolved conflicts for merge of dfaf2e03 to master

Change-Id: I440d2042dd404a421789063e42102699fa33b7c0

preloaded-classes

diff --git a/preloaded-classes b/preloaded-classes
index 8f87a0c..1a92546 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -258,11 +258,11 @@
 android.os.Handler
 android.os.HandlerThread
 android.os.IBinder
-android.os.IHardwareService$Stub
-android.os.IHardwareService$Stub$Proxy
 android.os.IPowerManager$Stub
 android.os.IPowerManager$Stub$Proxy
 android.os.IServiceManager
+android.os.IVibratorService$Stub
+android.os.IVibratorService$Stub$Proxy
 android.os.Looper
 android.os.Message
 android.os.Message$1