tree cf17a87325553649be202d9d15014ce54c053ba2
parent 6eac97d4baf77954c7d862e7bf35ed3763543491
parent cf33d50d25c5660bf1d4325c11433fb281bc31cb
author Adrian Roos <roosa@google.com> 1445621322 +0000
committer android-build-merger <android-build-merger@google.com> 1445621322 +0000

Merge changes from topic \'parcel-v2\' into mnc-dr-dev
am: cf33d50d25

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