summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-12-29 12:08:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-29 12:08:58 +0000
commit5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4 (patch)
treee5924693d1e4edc581146c82e553b42a50cb3e37 /core/java
parent44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a (diff)
parent645513828b2127e6914f46475b5492c308f16a4a (diff)
downloadframeworks_base-5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4.zip
frameworks_base-5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4.tar.gz
frameworks_base-5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4.tar.bz2
Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Debug.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 344dc91..9377def 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -104,7 +104,7 @@ public final class Debug
/**
* This class is used to retrieved various statistics about the memory mappings for this
- * process. The returns info broken down by dalvik, native, and other. All results are in kB.
+ * process. The returned info is broken down by dalvik, native, and other. All results are in kB.
*/
public static class MemoryInfo implements Parcelable {
/** The proportional set size for dalvik heap. (Doesn't include other Dalvik overhead.) */