OSDN Git Service

Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
authorDaniel Colascione <dancol@google.com>
Wed, 23 Aug 2017 03:54:08 +0000 (03:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Aug 2017 03:54:08 +0000 (03:54 +0000)
am: ea7a45eb43

Change-Id: I95f60dc9be2a837de985bc26dd67d20b8efe70d8

1  2 
core/jni/android_os_Debug.cpp

Simple merge