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:59:01 +0000 (21:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 21:59:01 +0000 (21:59 +0000)
commit1f3ca0c3b93d66824c4cc9a6e36103e3fa242205
tree9cdb9000eaa418f176fb3443f960fac0b1181e8f
parent0aba1c9c49f5c90d2bd816da94eacbc99c1219c7
parent0d2a22ece851b5ee358ac18214ccbfa28c3eb121
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25 am: 0c11f9918c am: bcc709b94d
am: 0d2a22ece8

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