OSDN Git Service

Merge "add swapPss of native process to totalSwapPss"
authorMartijn Coenen <maco@google.com>
Wed, 14 Feb 2018 11:08:54 +0000 (11:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Feb 2018 11:08:54 +0000 (11:08 +0000)
commitc3af6331e5374367a51a3c5ca21201bcb91bf38a
treefd4e42512ed7e799a1c83783700df2512c86018b
parent9b13db093882156ca5db38a628ffb6c34ba67ec6
parent0db84fcc8f1fdd1cd304225dc49bcba0c39d41e8
Merge "add swapPss of native process to totalSwapPss"
am: 0db84fcc8f

Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb
services/core/java/com/android/server/am/ActivityManagerService.java