diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-02-07 15:44:20 -0800 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2011-02-07 15:44:20 -0800 |
| commit | 26ce8fbd8fe488cc969b08f64c56525662763dc4 (patch) | |
| tree | 2a373088ccdee60f7a415417898b409ac4fa28da /dalvik/src/main | |
| parent | b0dd42c2b44ef61f116a7eea0e13237f55e07c9f (diff) | |
| parent | 6186821cb13f4ac7ff50950c813394367e021eae (diff) | |
| download | libcore-26ce8fbd8fe488cc969b08f64c56525662763dc4.zip libcore-26ce8fbd8fe488cc969b08f64c56525662763dc4.tar.gz libcore-26ce8fbd8fe488cc969b08f64c56525662763dc4.tar.bz2 | |
resolved conflicts for merge of 6186821c to dalvik-dev
Change-Id: Ic6f0172767d6feedb188d3a5e7488a67702ef8c4
Diffstat (limited to 'dalvik/src/main')
| -rw-r--r-- | dalvik/src/main/java/dalvik/system/SamplingProfiler.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java index 4d3a0d2..7946c02 100644 --- a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java +++ b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java @@ -25,7 +25,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; @@ -40,7 +39,7 @@ import java.util.Map; import java.util.Set; import java.util.Timer; import java.util.TimerTask; -import libcore.base.Objects; +import libcore.util.Objects; import libcore.io.IoUtils; /** |