Commit bcc709b9 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

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

am: 0c11f991

* commit '0c11f991':
  Maintain Parcel ABI
  Revert "Revert "Track ashmem memory usage in Parcel""
parents 69b8174c 0c11f991
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment