commit | 535bf8b0a09a8eef3e27abb6c25f52f0a3a9a321 | [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 | 273a16802b9880c311e96e210a925016312f01a4 | |
parent | 139c728d022e381849a8ea52fd1e5929e91bad41 [diff] | |
parent | 1b5149e5ba36597ce994d99c5ecfc7204fbfa0c9 [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""