tree 2dc3cd4515c605a5b2a613cbda72c95a56d2fab2
parent c01a38622a6290e679c1d1f4f90643063270cc81
parent 083769a3dffabfb968a03a700b9f2fd7838bcf75
author Christopher Ferris <cferris@google.com> 1413238203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413238203 +0000

am 083769a3: Merge "Return total footprint, not high water mark."

* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
  Return total footprint, not high water mark.