tree e785a9f7e7f834d2a8c181e8059b1d6b33524f97
parent 30ca9d659353fc14132c16a2b2b9f1895a776955
parent 747fdac426ea6dda789684af12b11392051366be
author Martijn Coenen <maco@google.com> 1461837288 +0000
committer android-build-merger <android-build-merger@google.com> 1461837288 +0000

Merge "Don\'t count vm_map_ram as used memory in vmallocinfo." into nyc-dev am: bf67e5d
am: 747fdac

* commit '747fdac426ea6dda789684af12b11392051366be':

Change-Id: I333cfb300bf13d0108c594b852045f297fed9c43