tree 8adca206c99d7e13763ce5b3e2cfd6d1ac34c8c4
parent 1bb6046a066899d0257042ebd3dd9b00cdca7510
parent c3af6331e5374367a51a3c5ca21201bcb91bf38a
author Martijn Coenen <maco@google.com> 1518606937 +0000
committer android-build-merger <android-build-merger@google.com> 1518606937 +0000

Merge "add swapPss of native process to totalSwapPss" am: 0db84fcc8f
am: c3af6331e5

Change-Id: I4e8dbdd04ae92d1b6882ac476e8b4990a34bbb27