OSDN Git Service

Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25 am: 0c11f9918c...
authorAdrian Roos <roosa@google.com>
Fri, 23 Oct 2015 21:59:01 +0000 (21:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 21:59:01 +0000 (21:59 +0000)
am: 0d2a22ece8

* commit '0d2a22ece851b5ee358ac18214ccbfa28c3eb121':
  Maintain Parcel ABI
  Revert "Revert "Track ashmem memory usage in Parcel""


Trivial merge