am d2ba02c2: (-s ours) am da34e27a: (-s ours) am 3db6149c: Merge "Update heap dump notes.  DO NOT MERGE." into gingerbread

Merge commit 'd2ba02c297bc8214611e347e27edee9f41772474' into dalvik-dev

* commit 'd2ba02c297bc8214611e347e27edee9f41772474':
  Update heap dump notes.  DO NOT MERGE.