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)
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel

1  2 
core/jni/android_os_Parcel.cpp

Simple merge