tree 9864c38f1b3fab3cef6fc0edccabbf8e0d33264b
parent 6639f734716a34c7abcabcfa686f67da08d8e068
parent 1c18c5d40ce7004d28aaa8f6c6713efcc72e6706
author Dianne Hackborn <hackbod@google.com> 1382997946 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382997946 -0700

am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev

* commit '1c18c5d40ce7004d28aaa8f6c6713efcc72e6706':
  Fix issue #11391003: Allow dumpsys meminfo to be used with native processes