OSDN Git Service

Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0
authorAdrian Roos <roosa@google.com>
Thu, 22 Oct 2015 01:02:27 +0000 (01:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Oct 2015 01:02:27 +0000 (01:02 +0000)
commitb531762c89e45b9ac5c401a2e90f9330bcdf629e
tree3d2b6158589412d78742ae63debb54569f4037f5
parent06496d04791f46a834a6d101068a1a999762d6a2
parentfda65d780eea9f696b087deb8d532b87e44877b6
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel
core/jni/android_os_Parcel.cpp