OSDN Git Service

Merge "Add more details to dumpsys meminfo -d"
authorMathieu Chartier <mathieuc@google.com>
Fri, 14 Jul 2017 21:37:43 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 21:37:43 +0000 (21:37 +0000)
commit41718e2413201f9040a78f493ead3adf160e0318
treec0bbc9e419b3400676389a05ea44a4b0ed194aee
parentd98024a1f9acfb2ba342a42300fda24e2bcff47f
parent4ccf8b83a171bc3b3028fd193cf5a2ec4ad3f31f
Merge "Add more details to dumpsys meminfo -d"
am: 4ccf8b83a1

Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904
core/jni/android_os_Debug.cpp
services/core/java/com/android/server/am/ActivityManagerService.java