tree c43b57318518011636ed436aadbd691bd4f323e5
parent 47698d990b43189ed63810348432dc540b7285f5
parent bcf09e40f1b5edb7c7e90a96efadba5482b13551
author Brian Carlstrom <bdc@google.com> 1382043085 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382043085 -0700

am bcf09e40: Merge "Fix dumpsys meminfo for art" into klp-dev

* commit 'bcf09e40f1b5edb7c7e90a96efadba5482b13551':
  Fix dumpsys meminfo for art