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

* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
  Return total footprint, not high water mark.
This commit is contained in:
Christopher Ferris 2014-10-13 22:15:58 +00:00 committed by Android Git Automerger
commit f7c3db67a1

Diff Content Not Available