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:49:18 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 21:49:18 +0000 (21:49 +0000)
commit0d2a22ece851b5ee358ac18214ccbfa28c3eb121
tree822859b8dc3549778b189374f237249d6c8f0caf
parent09be485667fc96df24d2e2ab6ce4fc4f26588739
parentbcc709b94d72e7f2d03d952dbf8a21b6980fd3a9
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""
include/binder/Parcel.h
libs/binder/Parcel.cpp