merge from open-source master

Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
2010-06-15 09:32:37 -07:00
parent 4138677a72 8942a31f13
commit 9629d42c19
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/ProcessStats.java
+++ b/services/java/com/android/server/ProcessStats.java
@@ -687,7 +687,7 @@ public class ProcessStats {
                        break;
                    }
                }
-                return new String(mBuffer, 0, 0, i);
+                return new String(mBuffer, 0, i);
            }
        } catch (java.io.FileNotFoundException e) {
        } catch (java.io.IOException e) {