tree 62ffd2fe80ff0ab73a9ec9bb206283f88fcc26a7
parent f86b91009de3bb164087c429231513a60df4079a
parent 18479e859f0e3603ee95187ecb46b7386156642e
author Daniel Colascione <dancol@google.com> 1503461916 +0000
committer android-build-merger <android-build-merger@google.com> 1503461916 +0000

Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev am: ea7a45eb43
am: 18479e859f

Change-Id: I5f4905341fa81361c1e0feb8a65944d93f840907