OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69b8174 0c11f99)
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25
authorAdrian Roos <roosa@google.com>
Fri, 23 Oct 2015 17:32:40 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 17:32:40 +0000 (17:32 +0000)
am: 0c11f9918c

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


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help