commit | 0d2a22ece851b5ee358ac18214ccbfa28c3eb121 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Fri Oct 23 21:49:18 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 21:49:18 2015 +0000 |
tree | 822859b8dc3549778b189374f237249d6c8f0caf | |
parent | 09be485667fc96df24d2e2ab6ce4fc4f26588739 [diff] | |
parent | bcc709b94d72e7f2d03d952dbf8a21b6980fd3a9 [diff] |
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25 am: 0c11f9918c am: bcc709b94d * commit 'bcc709b94d72e7f2d03d952dbf8a21b6980fd3a9': Maintain Parcel ABI Revert "Revert "Track ashmem memory usage in Parcel""