OSDN Git Service

Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
authorIan Pedowitz <ijpedowitz@google.com>
Thu, 22 Oct 2015 22:26:32 +0000 (22:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Oct 2015 22:26:32 +0000 (22:26 +0000)

Trivial merge