Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."

diff --cc core/java/android/os/Debug.java
index 344dc91,8e8b41d..9377def
--- 1/core/java/android/os/Debug.java
--- 2/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@@ -104,27 -105,15 +104,27 @@@ public final class Debu
  
      /**
       * 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. */
 +        /** The proportional set size for dalvik heap.  (Doesn't include other Dalvik overhead.) */
          public int dalvikPss;
 -        /** The private dirty pages used by dalvik. */
 +        /** The proportional set size that is swappable for dalvik heap. */
 +        /** @hide We may want to expose this, eventually. */
 +        public int dalvikSwappablePss;
 +        /** The private dirty pages used by dalvik heap. */
          public int dalvikPrivateDirty;
 -        /** The shared dirty pages used by dalvik. */
 +        /** The shared dirty pages used by dalvik heap. */
          public int dalvikSharedDirty;
 +        /** The private clean pages used by dalvik heap. */
 +        /** @hide We may want to expose this, eventually. */
 +        public int dalvikPrivateClean;
 +        /** The shared clean pages used by dalvik heap. */
 +        /** @hide We may want to expose this, eventually. */
 +        public int dalvikSharedClean;
 +        /** The dirty dalvik pages that have been swapped out. */
 +        /** @hide We may want to expose this, eventually. */
 +        public int dalvikSwappedOut;
  
          /** The proportional set size for the native heap. */
          public int nativePss;