diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-25 15:05:51 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-11-25 15:05:51 -0500 |
| commit | 726a570258828d85e401ab62fd4220812fe9344f (patch) | |
| tree | 11af59ce57ec093c026aac8516bddc31cb031a5a /preloaded-classes | |
| parent | 3fdee335fe95ab94ef1ee619ad37f9369447fde5 (diff) | |
| parent | dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c (diff) | |
| download | frameworks_base-726a570258828d85e401ab62fd4220812fe9344f.zip frameworks_base-726a570258828d85e401ab62fd4220812fe9344f.tar.gz frameworks_base-726a570258828d85e401ab62fd4220812fe9344f.tar.bz2 | |
resolved conflicts for merge of dfaf2e03 to master
Change-Id: I440d2042dd404a421789063e42102699fa33b7c0
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/preloaded-classes b/preloaded-classes index 8f87a0c..1a92546 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -258,11 +258,11 @@ android.os.FileUtils 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 |