tree 56f3a3bd57eb8b13cd4ef25bc37bd63e7d611ecd
parent 7f9be1cbfaafe9f92f3c073a7b48bbfaa12230ba
parent 6951d555c2060e19bd9db46a772852db8aa24dfe
author Mathieu Chartier <mathieuc@google.com> 1428640405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428640405 +0000

am 6951d555: am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""

* commit '6951d555c2060e19bd9db46a772852db8aa24dfe':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"