diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-25 11:54:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-25 11:54:18 -0800 |
| commit | dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c (patch) | |
| tree | 49ce089d9bb8560f05b6b08419e87bb229b426a2 /preloaded-classes | |
| parent | 3f6ee1a180268ca2e30723ce2c45b81c2e671abb (diff) | |
| parent | 30348b0de11b6c6cba43dfc7960e4d2084af6d8b (diff) | |
| download | frameworks_base-dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c.zip frameworks_base-dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c.tar.gz frameworks_base-dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c.tar.bz2 | |
am 30348b0d: Merge change I086d681f into eclair-mr2
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp
* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
Remove HardwareService and move vibrator support to VibratorService.
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/preloaded-classes b/preloaded-classes index fcfa7e2..b4e79b2 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -501,10 +501,8 @@ android.os.FileUtils android.os.FileUtils$FileStatus android.os.Handler android.os.HandlerThread -android.os.Hardware android.os.IBinder android.os.ICheckinService$Stub -android.os.IHardwareService$Stub android.os.IInterface android.os.IMountService$Stub android.os.IMountService$Stub$Proxy @@ -512,6 +510,7 @@ android.os.INetStatService$Stub android.os.IParentalControlCallback$Stub android.os.IPowerManager$Stub android.os.IPowerManager$Stub$Proxy +android.os.IVibratorService$Stub android.os.Looper android.os.MemoryFile android.os.Message |