tree 3732f7afaaa55ff7a31b484c909bbed134d8e9b0
parent 1c9d43eb0f6cdb33cc004b674b117da95230ce59
parent 34c120dc6142c861cb131c900cdee3c19f81ce51
author Dianne Hackborn <hackbod@google.com> 1444690820 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444690820 +0000

am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev

* commit '34c120dc6142c861cb131c900cdee3c19f81ce51':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...