tree fd4e42512ed7e799a1c83783700df2512c86018b
parent 9b13db093882156ca5db38a628ffb6c34ba67ec6
parent 0db84fcc8f1fdd1cd304225dc49bcba0c39d41e8
author Martijn Coenen <maco@google.com> 1518606534 +0000
committer android-build-merger <android-build-merger@google.com> 1518606534 +0000

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

Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb