tree 70ee65b2de47e6554486f20fc4790ddb5c70fc98
parent 62642e1b8e0f109031714cbbda41ebc305eede53
parent 5b7359aa442a120c2853a05bc987c501da659df2
author Dianne Hackborn <hackbod@google.com> 1379118738 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379118738 -0700

am 5b7359aa: am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev

* commit '5b7359aa442a120c2853a05bc987c501da659df2':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo